3 Commits

Author	SHA1	Message	Date
Evan Prodromou	a08c76a434	Merge branch '0.9.x' of git@gitorious.org:laconica/mainline into 0.9.x ... Conflicts: classes/laconica.ini	2009-08-27 14:52:32 -07:00
Evan Prodromou	5d09b6b3f0	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	2009-08-27 11:16:45 -07:00
Evan Prodromou	c87e1de017	Rename Laconica to StatusNet	2009-08-25 17:56:10 -04:00