Merge branch '0.8.x' into 0.9.x

Conflicts:
	EVENTS.txt
	actions/finishremotesubscribe.php
	actions/postnotice.php
	actions/public.php
	actions/remotesubscribe.php
	actions/showstream.php
	actions/updateprofile.php
	actions/userauthorization.php
	classes/laconica.ini
	lib/common.php
	lib/oauthstore.php
	lib/omb.php
This commit is contained in:
Evan Prodromou
2009-08-27 11:16:45 -07:00
432 changed files with 3590 additions and 3509 deletions

View File

@@ -28,6 +28,6 @@ Here are some documents that you might find helpful in understanding
* [Groups](%%doc.groups%%) - joining together in groups
* [OpenMicroBlogging](%%doc.openmublog%%) - subscribing to remote users
* [Privacy](%%doc.privacy%%) - %%site.name%%'s privacy policy
* [Source](%%doc.source%%) - How to get the Laconica source code
* [Badge](%%doc.badge%%) - How to put a Laconica badge on your blog or homepage
* [Source](%%doc.source%%) - How to get the StatusNet source code
* [Badge](%%doc.badge%%) - How to put a StatusNet badge on your blog or homepage
* [Bookmarklet](%%doc.bookmarklet%%) - Bookmarklet for posting Web pages