]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch '0.9.x' into merge
authorBrion Vibber <brion@pobox.com>
Tue, 7 Dec 2010 18:50:05 +0000 (10:50 -0800)
committerBrion Vibber <brion@pobox.com>
Tue, 7 Dec 2010 18:50:05 +0000 (10:50 -0800)
commit9df856e667a12cd217576263efbc72fff12692d9
treedc8d588e8b01d1ec788c78d6aec10a9b9d26bec6
parent01f32e3998b8d031d2a39e2d0506253142b6632e
parent4b4b763255ad3b2bff8f18da2bd3927b52a54e55
Merge branch '0.9.x' into merge

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
24 files changed:
EVENTS.txt
README
actions/hostmeta.php
actions/register.php
actions/shownotice.php
classes/File_redirection.php
classes/Notice.php
classes/Profile.php
classes/User.php
lib/apiaction.php
lib/cache.php
lib/command.php
lib/default.php
lib/designform.php
lib/designsettings.php
lib/framework.php
lib/htmloutputter.php
lib/router.php
lib/statusnet.php
lib/util.php
plugins/BitlyUrl/BitlyUrlPlugin.php
plugins/Mapstraction/MapstractionPlugin.php
plugins/OStatus/OStatusPlugin.php
plugins/OpenID/OpenIDPlugin.php