]> 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: de7ad99 12921d6)
Merge branch 'master' into 1.0.x
authorEvan Prodromou <evan@status.net>
Thu, 8 Mar 2012 12:08:11 +0000 (06:08 -0600)
committerEvan Prodromou <evan@status.net>
Thu, 8 Mar 2012 12:08:11 +0000 (06:08 -0600)
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. :-)