]> 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: 8a2144a bbfd6ef)
Merge branch 'master' of gitorious.org:statusnet/mainline
authorEvan Prodromou <evan@status.net>
Fri, 21 May 2010 20:47:57 +0000 (16:47 -0400)
committerEvan Prodromou <evan@status.net>
Fri, 21 May 2010 20:47:57 +0000 (16:47 -0400)
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. :-)