]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
projects / quix0rs-gnu-social.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 057ec1f)
Merge branch '0.9.x' into 1.0.x
authorCraig Andrews <candrews@integralblue.com>
Tue, 2 Feb 2010 22:00:10 +0000 (17:00 -0500)
committerCraig Andrews <candrews@integralblue.com>
Tue, 2 Feb 2010 22:00:10 +0000 (17:00 -0500)
Conflicts:
EVENTS.txt
lib/imqueuehandler.php
lib/jabber.php
lib/util.php
plugins/Xmpp/Sharing_XMPP.php


No differences found
This is my personal clone from the wonderful software GNUSocial. I may fix or break things here, so use it on your own risk. :-)