Commit 77164e9a authored by Evan Prodromou's avatar Evan Prodromou

Merge branch '1.1.x'

parents 10ea9127 884c0562
......@@ -123,7 +123,7 @@ It includes the following changes:
- Bug fix for conversation counts in conversation streams.
- Rights for moderators to manage spam.
A full changelog is available at http://status.net/wiki/StatusNet_1.1.0-alpha1.
A full changelog is available at http://status.net/wiki/StatusNet_1.1.0.
Troubleshooting
===============
......
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