• Evan Prodromou's avatar
    Merge branch '0.8.x' into 0.9.x · 5d09b6b3
    Evan Prodromou authored
    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
    5d09b6b3
help 1.62 KB