]> 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: cd4b23a ed6d5c6)
Merge branch 'faves' into 1.0.x
authorBrion Vibber <brion@pobox.com>
Thu, 17 Mar 2011 21:48:14 +0000 (14:48 -0700)
committerBrion Vibber <brion@pobox.com>
Thu, 17 Mar 2011 21:48:14 +0000 (14:48 -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. :-)