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.
This commit is contained in:
tilly-Q
2013-07-30 17:09:01 -04:00
parent 52a355b275
commit 9d6e453f8f
8 changed files with 35 additions and 20 deletions

View File

@@ -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