Merge branch 'master' into circular

* master:
  Fixing river blurblog when user has shared one of the stories.

Conflicts:
	apps/social/views.py
This commit is contained in:
Samuel Clay 2013-05-16 18:27:46 -07:00
commit 76744948be

View file

@ -287,7 +287,6 @@ def load_river_blurblog(request):
story['story_hash'] in read_feed_story_hashes):
story['read_status'] = 1
classifiers = sort_classifiers_by_feed(user=user, feed_ids=story_feed_ids,
classifier_feeds=classifier_feeds,
classifier_authors=classifier_authors,