]> 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: b595c3f 7977454)
Merge branch '3022' into testing
authorBrion Vibber <brion@pobox.com>
Tue, 1 Feb 2011 22:37:46 +0000 (14:37 -0800)
committerBrion Vibber <brion@pobox.com>
Tue, 1 Feb 2011 22:37:46 +0000 (14:37 -0800)
1  2 
lib/apiaction.php patch | diff1 | diff2 | blob | history

diff --cc lib/apiaction.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. :-)