Merge branch 'master' into bookmarklet

This commit is contained in:
Samuel Clay 2011-01-20 18:21:59 -05:00
commit ff027e2278

View file

@ -54,7 +54,7 @@ class UserSubscription(models.Model):
# Use the latest story to get last read time.
if MStory.objects(story_feed_id=self.feed.pk).first():
latest_story_date = MStory.objects(story_feed_id=self.feed.pk).order_by('-story_date').only('story_date')[0]['story_date']\
+ datetime.timedelta(minutes=1)
+ datetime.timedelta(seconds=1)
else:
latest_story_date = now