]> 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: 5a96b9e 09208f8)
Merge branch 'integration' into testing
authorBrion Vibber <brion@pobox.com>
Tue, 8 Jun 2010 01:19:12 +0000 (18:19 -0700)
committerBrion Vibber <brion@pobox.com>
Tue, 8 Jun 2010 01:19:12 +0000 (18:19 -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. :-)