]> 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: 30cdc69 558bfb8)
Merge branch '1.0.x' into qna
authorZach Copley <zach@status.net>
Thu, 17 Mar 2011 20:20:37 +0000 (13:20 -0700)
committerZach Copley <zach@status.net>
Thu, 17 Mar 2011 20:20:37 +0000 (13:20 -0700)

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. :-)