]> 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: 87c83de e1ac64f)
Merge remote branch 'origin/1.0.x' into 1.0.x
authorSamantha Doherty <sammy@status.net>
Fri, 10 Jun 2011 00:24:09 +0000 (20:24 -0400)
committerSamantha Doherty <sammy@status.net>
Fri, 10 Jun 2011 00:24:09 +0000 (20:24 -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. :-)