Merge remote branch 'statusnet/0.8.x' into 0.9.x
Conflicts: EVENTS.txt actions/requesttoken.php classes/File.php install.php lib/action.php lib/noticeform.php
Showing
We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.
Conflicts: EVENTS.txt actions/requesttoken.php classes/File.php install.php lib/action.php lib/noticeform.php