projects / quix0rs-gnu-social.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 78a8eb5 9034148)
Merge branch '1.1.x'
authorEvan Prodromou <evan@status.net>
Mon, 9 Jul 2012 13:46:45 +0000 (09:46 -0400)
committerEvan Prodromou <evan@status.net>
Mon, 9 Jul 2012 13:46:45 +0000 (09:46 -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. :-)