Merge branch 'stable' into develop

This commit is contained in:
Dennis Schubert 2015-07-24 04:17:02 +02:00
commit 1904520d30

View file

@ -65,6 +65,8 @@ With the port to Bootstrap 3, app/views/terms/default.haml has a new structure.
## Features
* Implement NodeInfo [#6239](https://github.com/diaspora/diaspora/pull/6239)
# 0.5.2.0
## Refactor