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
..
2009-08-21 16:46:47 -04:00
2009-08-27 11:16:45 -07:00
2009-08-27 11:16:45 -07:00
2009-08-27 11:16:45 -07:00
2009-08-27 11:16:45 -07:00
2009-08-21 17:01:48 -04:00
2009-08-27 11:16:45 -07:00
2009-08-27 11:16:45 -07:00
2009-08-04 13:17:43 -04:00