]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch '0.9.x' into 1.0.x
authorBrion Vibber <brion@pobox.com>
Mon, 25 Oct 2010 20:08:57 +0000 (13:08 -0700)
committerBrion Vibber <brion@pobox.com>
Mon, 25 Oct 2010 20:08:57 +0000 (13:08 -0700)
commitca489631db840e33757a71a7e4cb56b187c182d3
tree92c71b81b6870a8fd2d9c94bed8571b653d95413
parent90c87553ee7566593529199374215ae80bb3e209
parent01637bcd32921d6857fb7f5c0bbd40fba6bdb830
Merge branch '0.9.x' into 1.0.x

Conflicts:
actions/subscriptions.php
lib/router.php
lib/xmppmanager.php
lib/xmppoutqueuehandler.php
16 files changed:
EVENTS.txt
README
actions/apiaccountupdatedeliverydevice.php
actions/register.php
actions/showstream.php
actions/subscriptions.php
classes/Notice_tag.php
classes/Profile.php
classes/User.php
classes/statusnet.ini
db/statusnet.sql
lib/apiaction.php
lib/common.php
lib/router.php
lib/util.php
plugins/OpenID/OpenIDPlugin.php