Merge branch 'stable' into develop

a5eb7d5d · Dennis Schubert · 80db1880 · b80785e0 · a5eb7d5d
Commit a5eb7d5d authored Jun 08, 2015 by Dennis Schubert
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

Changelog.md Changelog.md +2 -0

No files found.
--- a/Changelog.md
+++ b/Changelog.md
@@ -31,6 +31,8 @@ Ruby 2.0 is no longer officially supported.
 ## Features
 * Support color themes [#6033](https://github.com/diaspora/diaspora/pull/6033)

+# 0.5.2.0
+
 # 0.5.1.0

 ## Configuration changes