Merge branch 'stable' into develop

diaspora · Jul 24, 2015 · 1904520 · 1904520
2 parents be8f920 + d68b3f0
commit 1904520
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -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