]> 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: 67cb4c5 9f785f6)
Merge branch '1.0.x' into testing
authorEvan Prodromou <evan@status.net>
Tue, 21 Jun 2011 15:33:18 +0000 (11:33 -0400)
committerEvan Prodromou <evan@status.net>
Tue, 21 Jun 2011 15:33:18 +0000 (11: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. :-)