]> 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: ed61a21 c6d6749)
Merge branch '1.0.x' into testing
authorEvan Prodromou <evan@status.net>
Thu, 9 Jun 2011 14:33:36 +0000 (10:33 -0400)
committerEvan Prodromou <evan@status.net>
Thu, 9 Jun 2011 14:33:36 +0000 (10:33 -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. :-)