Merge branch 'stable' into develop

This commit is contained in:
Dennis Schubert 2016-06-20 05:24:49 +02:00
commit 68086fbf0b

View file

@ -154,6 +154,14 @@ before.
* Add links to the single post view of the related post to photos in the photo stream [#6621](https://github.com/diaspora/diaspora/pull/6621) * Add links to the single post view of the related post to photos in the photo stream [#6621](https://github.com/diaspora/diaspora/pull/6621)
* Add a note for people with disabled JavaScript [#6777](https://github.com/diaspora/diaspora/pull/6777) * Add a note for people with disabled JavaScript [#6777](https://github.com/diaspora/diaspora/pull/6777)
# 0.5.11.0
## Refactor
## Bug fixes
## Features
# 0.5.10.0 # 0.5.10.0
## Refactor ## Refactor
@ -161,10 +169,6 @@ before.
* Removed the publisher from a user's photo stream due to various issues [#6851](https://github.com/diaspora/diaspora/pull/6851) * Removed the publisher from a user's photo stream due to various issues [#6851](https://github.com/diaspora/diaspora/pull/6851)
* Don't implicitly ignore missing templateName in app.views.Base [#6877](https://github.com/diaspora/diaspora/pull/6877) * Don't implicitly ignore missing templateName in app.views.Base [#6877](https://github.com/diaspora/diaspora/pull/6877)
## Bug fixes
## Features
# 0.5.9.1 # 0.5.9.1
Update Nokogiri to 1.6.8, which in turn updates libxml2 to 2.9.4 and libxslt to 1.1.29, Update Nokogiri to 1.6.8, which in turn updates libxml2 to 2.9.4 and libxslt to 1.1.29,