]> 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: aa4848d efa930a)
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
authorEvan Prodromou <evan@status.net>
Wed, 3 Feb 2010 17:32:48 +0000 (12:32 -0500)
committerEvan Prodromou <evan@status.net>
Wed, 3 Feb 2010 17:32:48 +0000 (12:32 -0500)
1  2 
classes/statusnet.ini patch | diff1 | diff2 | blob | history

diff --cc classes/statusnet.ini
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. :-)