]> 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: 76d2a71 e432df7)
Merge commit 'jeff-themovie/0.8.x-private-returnto' into 0.8.x
authorCraig Andrews <candrews@integralblue.com>
Tue, 11 Aug 2009 14:42:04 +0000 (10:42 -0400)
committerCraig Andrews <candrews@integralblue.com>
Tue, 11 Aug 2009 14:42:04 +0000 (10:42 -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. :-)