projects / quix0rs-gnu-social.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c498f6e ce6be4f)
Merge branch 'master' into testing
authorBrion Vibber <brion@pobox.com>
Thu, 18 Feb 2010 00:52:13 +0000 (16:52 -0800)
committerBrion Vibber <brion@pobox.com>
Thu, 18 Feb 2010 00:52:13 +0000 (16:52 -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. :-)