Merge branch '1.1.x'

This commit is contained in:
Evan Prodromou 2012-04-17 09:40:44 -04:00
commit 77164e9ab9

2
README
View File

@ -123,7 +123,7 @@ It includes the following changes:
- Bug fix for conversation counts in conversation streams. - Bug fix for conversation counts in conversation streams.
- Rights for moderators to manage spam. - 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 Troubleshooting
=============== ===============