]> 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: 523d275 fb9ecdd)
Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x
authorBrion Vibber <brion@pobox.com>
Tue, 4 Jan 2011 20:14:08 +0000 (12:14 -0800)
committerBrion Vibber <brion@pobox.com>
Tue, 4 Jan 2011 20:14:08 +0000 (12:14 -0800)
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. :-)