• 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
..
Auth Loading commit data...
Console Loading commit data...
DB Loading commit data...
HTTP Loading commit data...
MIME Loading commit data...
Mail Loading commit data...
Net Loading commit data...
PEAR Loading commit data...
Stomp Loading commit data...
System Loading commit data...
htmLawed Loading commit data...
libomb Loading commit data...
php-gettext Loading commit data...
Apache2.0.txt Loading commit data...
DB.php Loading commit data...
Mail.php Loading commit data...
OAuth.php Loading commit data...
OAuth_LICENSE.txt Loading commit data...
PEAR.php Loading commit data...
PHP_License_2_02.txt Loading commit data...
PHP_License_3.01.txt Loading commit data...
PHP_Markdown_License.text Loading commit data...
README Loading commit data...
Stomp.php Loading commit data...
Validate.php Loading commit data...
get_temp_dir.php Loading commit data...
gpl-2.0.txt Loading commit data...
lgpl-2.1.txt Loading commit data...
markdown.php Loading commit data...