]> 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: a8d92da bf468e2)
Merge branch 'master' into testing
authorBrion Vibber <brion@pobox.com>
Mon, 29 Mar 2010 22:14:25 +0000 (15:14 -0700)
committerBrion Vibber <brion@pobox.com>
Mon, 29 Mar 2010 22:14:25 +0000 (15:14 -0700)
Conflicts:
plugins/Blacklist/BlacklistPlugin.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. :-)