diff options
| author | Aditi <aditi.iitr@gmail.com> | 2013-08-22 22:34:06 +0530 |
|---|---|---|
| committer | Aditi <aditi.iitr@gmail.com> | 2013-08-22 22:34:06 +0530 |
| commit | 70cc6eb8f383dcc97aeac22216a9da0d65a09085 (patch) | |
| tree | 7f9d646002f2e6db763b1b3e89d9762efb12a544 /mediagoblin/notifications | |
| parent | e018b2120ac4131afab6611c84f8cfbe0926e640 (diff) | |
| parent | e7b8059f17c98ee88d933af52b0c4d858e882e8e (diff) | |
| download | mediagoblin-70cc6eb8f383dcc97aeac22216a9da0d65a09085.tar.lz mediagoblin-70cc6eb8f383dcc97aeac22216a9da0d65a09085.tar.xz mediagoblin-70cc6eb8f383dcc97aeac22216a9da0d65a09085.zip | |
Resolve merge conflict and merge.
Diffstat (limited to 'mediagoblin/notifications')
| -rw-r--r-- | mediagoblin/notifications/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mediagoblin/notifications/__init__.py b/mediagoblin/notifications/__init__.py index 4b7fbb8c..ed9f8d78 100644 --- a/mediagoblin/notifications/__init__.py +++ b/mediagoblin/notifications/__init__.py @@ -18,7 +18,6 @@ import logging from mediagoblin.db.models import Notification, \ CommentNotification, CommentSubscription -from mediagoblin.notifications.task import email_notification_task from mediagoblin.notifications.tools import generate_comment_message _log = logging.getLogger(__name__) @@ -50,6 +49,7 @@ def trigger_notification(comment, media_entry, request): media_entry, request) + from mediagoblin.notifications.task import email_notification_task email_notification_task.apply_async([cn.id, message]) |