]> 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: 2a426f2 66518df)
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
authorBrion Vibber <brion@pobox.com>
Thu, 11 Mar 2010 01:04:51 +0000 (17:04 -0800)
committerBrion Vibber <brion@pobox.com>
Thu, 11 Mar 2010 01:04:51 +0000 (17:04 -0800)
1  2 
classes/File.php patch | diff1 | diff2 | blob | history
plugins/OStatus/OStatusPlugin.php patch | diff1 | diff2 | blob | history

diff --cc classes/File.php
Simple merge
diff --cc plugins/OStatus/OStatusPlugin.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. :-)