]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
projects / quix0rs-gnu-social.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 420c361 8c073a3)
Merge branch '0.8.x' of git://gitorious.org/laconica/dev into 0.8.x
authorFederico Marani <federico.marani@ymail.com>
Sat, 28 Mar 2009 13:52:01 +0000 (13:52 +0000)
committerFederico Marani <federico.marani@ymail.com>
Sat, 28 Mar 2009 13:52:01 +0000 (13:52 +0000)
Conflicts:

lib/jabber.php


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