aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/user_pages/views.py
diff options
context:
space:
mode:
authortilly-Q <nattilypigeonfowl@gmail.com>2013-07-30 17:09:01 -0400
committertilly-Q <nattilypigeonfowl@gmail.com>2013-07-31 20:11:26 -0400
commit9d6e453f8fd337813c2933835aedff2949193fbe (patch)
tree99a307b30ea3bbc6cfc81c4e9d2ea437935e894e /mediagoblin/user_pages/views.py
parent52a355b27541597fc155dab5e4885207b12a0a7b (diff)
downloadmediagoblin-9d6e453f8fd337813c2933835aedff2949193fbe.tar.lz
mediagoblin-9d6e453f8fd337813c2933835aedff2949193fbe.tar.xz
mediagoblin-9d6e453f8fd337813c2933835aedff2949193fbe.zip
This commit was the work I did fixing errors that cropped up from the merge.
There were a few errors because of the switch from sqlalchemy 0.7 to 0.8 but I cleared them up.
Diffstat (limited to 'mediagoblin/user_pages/views.py')
-rw-r--r--mediagoblin/user_pages/views.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py
index 06ea0ab0..161a47e2 100644
--- a/mediagoblin/user_pages/views.py
+++ b/mediagoblin/user_pages/views.py
@@ -27,7 +27,7 @@ from mediagoblin.tools.translate import pass_to_ugettext as _
from mediagoblin.tools.pagination import Pagination
from mediagoblin.user_pages import forms as user_forms
from mediagoblin.user_pages.lib import (send_comment_email,
- add_media_to_collection)
+ add_media_to_collection, build_report_object)
from mediagoblin.notifications import trigger_notification, \
add_comment_subscription, mark_comment_notification_seen