Merge branch 'stable' into develop

This commit is contained in:
Steffen van Bergerem 2016-01-04 14:19:53 +01:00
commit 079d5ab298

View file

@ -99,7 +99,8 @@ With the port to Bootstrap 3, app/views/terms/default.haml has a new structure.
## Features
Display hovercards without aspect dropdown when logged out [#6603](https://github.com/diaspora/diaspora/pull/6603)
* Display hovercards without aspect dropdown when logged out [#6603](https://github.com/diaspora/diaspora/pull/6603)
* Add media.ccc.de as a trusted oEmbed endpoint
# 0.5.5.1