Merge branch 'stable' into develop

This commit is contained in:
Jonne Haß 2015-09-14 22:09:04 +02:00
commit 3a29cb28ff

View file

@ -80,6 +80,7 @@ With the port to Bootstrap 3, app/views/terms/default.haml has a new structure.
* Show spinner on initial stream load [#6384](https://github.com/diaspora/diaspora/pull/6384)
* Add new moderator role. Moderators can view and act on reported posts [#6351](https://github.com/diaspora/diaspora/pull/6351)
* Only post to the primary tumblr blog [#6386](https://github.com/diaspora/diaspora/pull/6386)
* Always show public photos on profile page [#6398](https://github.com/diaspora/diaspora/pull/6398)
# 0.5.3.1