]> 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: 7f1b872 e903ff0)
Merge branch 'testing'
authorEvan Prodromou <evan@status.net>
Tue, 8 Feb 2011 16:52:40 +0000 (11:52 -0500)
committerEvan Prodromou <evan@status.net>
Tue, 8 Feb 2011 16:52:40 +0000 (11:52 -0500)
Conflicts:
plugins/Facebook/facebookaction.php
plugins/Facebook/facebookhome.php
plugins/Facebook/facebookutil.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. :-)