]> 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: 3ffe2e3 8cd1bdc)
Merge branch '1.1.x'
authorEvan Prodromou <evan@status.net>
Fri, 6 Jul 2012 14:47:00 +0000 (10:47 -0400)
committerEvan Prodromou <evan@status.net>
Fri, 6 Jul 2012 14:47:00 +0000 (10:47 -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. :-)