]> 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: 8104b1f 182a8cf)
Merge branch '1.0.x' into testing
authorEvan Prodromou <evan@status.net>
Mon, 20 Jun 2011 16:23:16 +0000 (12:23 -0400)
committerEvan Prodromou <evan@status.net>
Mon, 20 Jun 2011 16:23:16 +0000 (12:23 -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. :-)