]> 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: ad3406a 3e7a2a4)
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
authorEvan Prodromou <evan@status.net>
Sun, 21 Feb 2010 19:18:16 +0000 (14:18 -0500)
committerEvan Prodromou <evan@status.net>
Sun, 21 Feb 2010 19:18:16 +0000 (14:18 -0500)
1  2 
plugins/OStatus/lib/salmonaction.php patch | diff1 | diff2 | blob | history

diff --cc plugins/OStatus/lib/salmonaction.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. :-)