Merge branch 'stable' into develop

This commit is contained in:
Steffen van Bergerem 2016-01-21 21:13:01 +01:00
commit f6da6a68f6

View file

@ -104,10 +104,10 @@ Contributions are very welcome, the hard work is done!
## Refactor ## Refactor
* Internationalize controller rescue\_from text [#6554](https://github.com/diaspora/diaspora/pull/6554) * Internationalize controller rescue\_from text [#6554](https://github.com/diaspora/diaspora/pull/6554)
# Bug fixes ## Bug fixes
* Fix plural rules handling more than wanted as "one" [#6630](https://github.com/diaspora/diaspora/pull/6630) * Fix plural rules handling more than wanted as "one" [#6630](https://github.com/diaspora/diaspora/pull/6630)
# Features ## Features
* Keyboard shortcuts now do work on profile pages as well [#6647](https://github.com/diaspora/diaspora/pull/6647/files) * Keyboard shortcuts now do work on profile pages as well [#6647](https://github.com/diaspora/diaspora/pull/6647/files)
# 0.5.6.0 # 0.5.6.0