]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
authorBrion Vibber <brion@pobox.com>
Mon, 4 Oct 2010 19:54:36 +0000 (12:54 -0700)
committerBrion Vibber <brion@pobox.com>
Mon, 4 Oct 2010 19:54:36 +0000 (12:54 -0700)
commit59119482ca34540bd7f0a2a1aa994de1d5328ea2
tree864fdc9dda3da54a78d868339c32479b5296b6d0
parent2db8aa3ec3f6804f8f16efe754aafb149f4035c9
parent1652ded48c9c62c40157a5142e5231adbc574ddb
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x

Conflicts:
actions/hostmeta.php
actions/imsettings.php
classes/User.php
lib/adminpanelaction.php
lib/channel.php
lib/default.php
lib/router.php
lib/util.php
32 files changed:
EVENTS.txt
actions/apiaccountupdatedeliverydevice.php
actions/shownotice.php
classes/File_redirection.php
classes/Memcached_DataObject.php
classes/Notice.php
classes/Profile.php
classes/User.php
lib/adminpanelaction.php
lib/apiaction.php
lib/cache.php
lib/channel.php
lib/command.php
lib/common.php
lib/connectsettingsaction.php
lib/default.php
lib/htmloutputter.php
lib/router.php
lib/util.php
lib/xrd.php
plugins/BitlyUrl/BitlyUrlPlugin.php
plugins/CasAuthentication/caslogin.php
plugins/ClientSideShorten/ClientSideShortenPlugin.php
plugins/Geonames/GeonamesPlugin.php
plugins/Imap/imapmanager.php
plugins/LdapCommon/LdapCommon.php
plugins/LilUrl/LilUrlPlugin.php
plugins/Minify/MinifyPlugin.php
plugins/Minify/minify.php
plugins/OStatus/OStatusPlugin.php
plugins/OpenID/OpenIDPlugin.php
plugins/Recaptcha/RecaptchaPlugin.php