• Brion Vibber's avatar
    Merge branch '0.9.x' into merge · 9df856e6
    Brion Vibber authored
    Conflicts:
    	README
    	actions/hostmeta.php
    	classes/File_redirection.php
    	lib/common.php
    	lib/designsettings.php
    	lib/router.php
    	lib/util.php
    	lib/xmppmanager.php
    	plugins/OStatus/OStatusPlugin.php
    9df856e6
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...