]> 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: c8bdf3c f3cea24)
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
authorSarven Capadisli <csarven@status.net>
Wed, 3 Mar 2010 17:57:03 +0000 (12:57 -0500)
committerSarven Capadisli <csarven@status.net>
Wed, 3 Mar 2010 17:57:03 +0000 (12:57 -0500)
1  2 
plugins/OStatus/OStatusPlugin.php patch | diff1 | diff2 | blob | history

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. :-)