]> 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: d016482 e109b25)
Merge branch '1.0.x' into inline-comments
authorBrion Vibber <brion@pobox.com>
Tue, 1 Mar 2011 00:48:05 +0000 (16:48 -0800)
committerBrion Vibber <brion@pobox.com>
Tue, 1 Mar 2011 00:48:05 +0000 (16:48 -0800)

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