]> 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: ed3d684 ffa0007)
Merge branch '0.7.x' into 0.8.x
authorSarven Capadisli <csarven@controlyourself.ca>
Mon, 13 Apr 2009 16:42:53 +0000 (16:42 +0000)
committerSarven Capadisli <csarven@controlyourself.ca>
Mon, 13 Apr 2009 16:42:53 +0000 (16:42 +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. :-)