Commit 80db1880 authored by Dennis Schubert's avatar Dennis Schubert

Merge branch 'stable' into develop

parents 8a4ec1d4 ebd12430
......@@ -33,6 +33,13 @@ Ruby 2.0 is no longer officially supported.
## Configuration changes
Please note that the default listen parameter for production setups got
changed. diaspora\* will no longer listen on `` as it will now
bind to an UNIX socket at `unix:tmp/diaspora.sock`. Please change your local
`diaspora.yml` if necessary.
## Refactor
* Use Bootstrap modal for new aspect pane [#5850](
* Use asset helper instead of .css.erb [#5886](
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment