]> 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: e603bcd 36d724c)
Merge branch 'master' into 1.1.x
authorEvan Prodromou <evan@status.net>
Mon, 16 Apr 2012 19:49:55 +0000 (15:49 -0400)
committerEvan Prodromou <evan@status.net>
Mon, 16 Apr 2012 19:49:55 +0000 (15:49 -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. :-)