]> 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: effa4f5 17ed30d)
Merge remote branch 'statusnet/testing' into testing
authorJames Walker <walkah@walkah.net>
Mon, 22 Feb 2010 06:40:03 +0000 (01:40 -0500)
committerJames Walker <walkah@walkah.net>
Mon, 22 Feb 2010 06:40:03 +0000 (01:40 -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. :-)