]> 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: 6972225 fd608c0)
Merge commit 'origin/master' into testing
authorBrion Vibber <brion@pobox.com>
Thu, 25 Mar 2010 18:43:26 +0000 (11:43 -0700)
committerBrion Vibber <brion@pobox.com>
Thu, 25 Mar 2010 18:43:26 +0000 (11:43 -0700)
Conflicts:
classes/Notice.php


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