]> 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: 6d2ba2b 0755f45)
Merge branch '1.0.x' into testing
authorEvan Prodromou <evan@status.net>
Wed, 22 Jun 2011 21:21:20 +0000 (17:21 -0400)
committerEvan Prodromou <evan@status.net>
Wed, 22 Jun 2011 21:21:20 +0000 (17:21 -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. :-)