Merge branch 'stable' into develop

This commit is contained in:
Dennis Schubert 2015-10-12 03:44:44 +02:00
commit 2b2ce66126

View file

@ -83,6 +83,14 @@ With the port to Bootstrap 3, app/views/terms/default.haml has a new structure.
* Add permalink icon to stream elements [#6457](https://github.com/diaspora/diaspora/pull/6457) * Add permalink icon to stream elements [#6457](https://github.com/diaspora/diaspora/pull/6457)
* Move reshare count to interactions for stream elements [#6487](https://github.com/diaspora/diaspora/pull/6487) * Move reshare count to interactions for stream elements [#6487](https://github.com/diaspora/diaspora/pull/6487)
# 0.5.5.0
## Refactor
## Bug fixes
## Features
# 0.5.4.0 # 0.5.4.0
## Refactor ## Refactor