]> 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: 1f6bbc1 c7f14cd)
Merge branch 'master' into 0.9.x
authorEvan Prodromou <evan@status.net>
Tue, 19 Jan 2010 05:31:42 +0000 (00:31 -0500)
committerEvan Prodromou <evan@status.net>
Tue, 19 Jan 2010 05:31:42 +0000 (00:31 -0500)
1  2 
lib/default.php patch | diff1 | diff2 | blob | history

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