]> 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>
Thu, 10 Jun 2010 22:37:06 +0000 (15:37 -0700)
committerBrion Vibber <brion@pobox.com>
Thu, 10 Jun 2010 22:37:06 +0000 (15:37 -0700)
commitb1a68e15b760aa2e588680c9e8c7526a7a6d1d13
tree6100f1aa00f9930433f178173099c0ce67fdc502
parent7cc58b97feb822ab999b7fefa3a50ce53a7838d5
parente121d472e7dbb914a85b10bde0a9e2add4d19d11
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x

Conflicts:
lib/default.php
lib/util.php
plugins/UrlShortener/UrlShortenerPlugin.php (has been removed?)
13 files changed:
actions/apiaccountupdatedeliverydevice.php
index.php
lib/apiaction.php
lib/default.php
lib/router.php
lib/util.php
plugins/BitlyUrl/BitlyUrlPlugin.php
plugins/ClientSideShorten/ClientSideShortenPlugin.php
plugins/Imap/imapmanager.php
plugins/LilUrl/LilUrlPlugin.php
plugins/PtitUrl/PtitUrlPlugin.php
plugins/SimpleUrl/SimpleUrlPlugin.php
plugins/TightUrl/TightUrlPlugin.php