]> 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: f4459df f396701)
Merge commit 'origin/0.9.x' into 0.9.x
authorBrenda Wallace <shiny@cpan.org>
Sat, 9 Jan 2010 21:43:25 +0000 (21:43 +0000)
committerBrenda Wallace <shiny@cpan.org>
Sat, 9 Jan 2010 21:43:25 +0000 (21:43 +0000)
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. :-)