]> 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: 40d4668 c93031c)
Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
authorEvan Prodromou <evan@controlyourself.ca>
Tue, 26 May 2009 21:28:12 +0000 (17:28 -0400)
committerEvan Prodromou <evan@controlyourself.ca>
Tue, 26 May 2009 21:28:12 +0000 (17:28 -0400)
1  2 
index.php patch | diff1 | diff2 | blob | history

diff --cc index.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. :-)