projects / quix0rs-gnu-social.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5bdc6fa 5a1cbdc)
Merge branch 'master' of gitorious.org:statusnet/mainline into testing
authorBrion Vibber <brion@pobox.com>
Thu, 4 Feb 2010 19:56:07 +0000 (11:56 -0800)
committerBrion Vibber <brion@pobox.com>
Thu, 4 Feb 2010 19:56:07 +0000 (11:56 -0800)
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. :-)