]> git.mxchange.org Git - quix0rs-gnu-social.git/commit - classes/User_im_prefs.php
Merge branch '0.9.x' into 1.0.x
authorCraig Andrews <candrews@integralblue.com>
Tue, 16 Feb 2010 18:15:09 +0000 (13:15 -0500)
committerCraig Andrews <candrews@integralblue.com>
Tue, 16 Feb 2010 18:15:09 +0000 (13:15 -0500)
commit20d6a7caed6636c28cc7b95c584549691dff4388
treebcf44f5f31a38ff08b363ab45ab486ace9ff1a99
parent32084e33a266797b306158df29e48f057651b410
parentd5cbfe8071d56438cfa168dc3db56a959317eae0
Merge branch '0.9.x' into 1.0.x

Conflicts:
lib/queuemanager.php
lib/xmppmanager.php
plugins/Xmpp/Fake_XMPP.php
scripts/imdaemon.php
EVENTS.txt
lib/immanager.php
lib/implugin.php
lib/imsenderqueuehandler.php
lib/queuemanager.php
lib/statusnet.php
lib/util.php
scripts/imdaemon.php