]> 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: e119362 b5be659)
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
authorEvan Prodromou <evan@status.net>
Mon, 28 Dec 2009 23:50:41 +0000 (15:50 -0800)
committerEvan Prodromou <evan@status.net>
Mon, 28 Dec 2009 23:50:41 +0000 (15:50 -0800)
Conflicts:
scripts/setconfig.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. :-)