]> 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: 4b5cbea 603fc33)
Merge remote branch 'origin/1.0.x' into 1.0.x
authorEvan Prodromou <evan@status.net>
Thu, 14 Apr 2011 19:35:15 +0000 (15:35 -0400)
committerEvan Prodromou <evan@status.net>
Thu, 14 Apr 2011 19:35:15 +0000 (15:35 -0400)

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. :-)