]> 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: cc063ae 1ec54d3)
Merge branch 'forward' into 0.9.x
authorEvan Prodromou <evan@status.net>
Sat, 12 Dec 2009 21:18:55 +0000 (16:18 -0500)
committerEvan Prodromou <evan@status.net>
Sat, 12 Dec 2009 21:18:55 +0000 (16:18 -0500)
1  2 
lib/api.php patch | diff1 | diff2 | blob | history

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