]> 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: ef3991d 7e7d888)
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
authorBrion Vibber <brion@pobox.com>
Mon, 8 Mar 2010 21:37:45 +0000 (13:37 -0800)
committerBrion Vibber <brion@pobox.com>
Mon, 8 Mar 2010 21:37:45 +0000 (13:37 -0800)
1  2 
config.php.sample patch | diff1 | diff2 | blob | history

diff --cc config.php.sample
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. :-)