]> 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: 10ea912 884c056)
Merge branch '1.1.x'
authorEvan Prodromou <evan@status.net>
Tue, 17 Apr 2012 13:40:44 +0000 (09:40 -0400)
committerEvan Prodromou <evan@status.net>
Tue, 17 Apr 2012 13:40:44 +0000 (09:40 -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. :-)