• Zach Copley's avatar
    Merge branch '0.9.x' into 1.0.x · b7d07466
    Zach Copley authored
    Conflicts:
    	actions/confirmaddress.php
    	actions/emailsettings.php
    	actions/hostmeta.php
    	actions/imsettings.php
    	actions/login.php
    	actions/profilesettings.php
    	actions/showgroup.php
    	actions/smssettings.php
    	actions/urlsettings.php
    	actions/userauthorization.php
    	actions/userdesignsettings.php
    	classes/Memcached_DataObject.php
    	index.php
    	lib/accountsettingsaction.php
    	lib/action.php
    	lib/common.php
    	lib/connectsettingsaction.php
    	lib/designsettings.php
    	lib/personalgroupnav.php
    	lib/profileaction.php
    	lib/userprofile.php
    	plugins/ClientSideShorten/ClientSideShortenPlugin.php
    	plugins/Facebook/FBConnectSettings.php
    	plugins/Facebook/FacebookPlugin.php
    	plugins/NewMenu/NewMenuPlugin.php
    	plugins/NewMenu/newmenu.css
    b7d07466
Name
Last commit
Last update
..
about Loading commit data...
api Loading commit data...
badge Loading commit data...
bookmarklet Loading commit data...
contact Loading commit data...
faq Loading commit data...
groups Loading commit data...
help Loading commit data...
im Loading commit data...
openmublog Loading commit data...
privacy Loading commit data...
sms Loading commit data...
source Loading commit data...
tags Loading commit data...
tos Loading commit data...