Merge branch 'stable' into develop

diaspora · May 4, 2015 · f2e26df · f2e26df
2 parents 971a3dd + 19fd36b
commit f2e26df
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -38,6 +38,7 @@ Ruby 2.0 is no longer officially supported.
 * More and better environment checks in script/server [#5891](https://github.com/diaspora/diaspora/pull/5891)
 * Enable aspect sorting again [#5559](https://github.com/diaspora/diaspora/pull/5559)
 * Submit messages in conversations with Ctrl+Enter [#5910](https://github.com/diaspora/diaspora/pull/5910)
+* Support syntax highlighting for fenced code blocks [#5908](https://github.com/diaspora/diaspora/pull/5908)
 
 # 0.5.0.0