]> 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: c71d701 46123e3)
Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x
authorBrion Vibber <brion@pobox.com>
Mon, 20 Dec 2010 22:23:15 +0000 (14:23 -0800)
committerBrion Vibber <brion@pobox.com>
Mon, 20 Dec 2010 22:23:15 +0000 (14:23 -0800)
Conflicts:
plugins/OStatus/classes/FeedSub.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. :-)