]> 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: 7f0e575 251fd2c)
Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
authorEvan Prodromou <evan@controlyourself.ca>
Mon, 11 May 2009 21:53:23 +0000 (17:53 -0400)
committerEvan Prodromou <evan@controlyourself.ca>
Mon, 11 May 2009 21:53:23 +0000 (17:53 -0400)
Conflicts:
config.php.sample

1  2 
lib/common.php patch | diff1 | diff2 | blob | history

diff --cc lib/common.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. :-)