]> 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: e891075 a020e23)
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
authorBrion Vibber <brion@pobox.com>
Thu, 4 Feb 2010 20:23:56 +0000 (12:23 -0800)
committerBrion Vibber <brion@pobox.com>
Thu, 4 Feb 2010 20:23:56 +0000 (12:23 -0800)
1  2 
lib/default.php patch | diff1 | diff2 | blob | history

diff --cc lib/default.php
Simple 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. :-)