]> 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: 866dfa6 63eddf2)
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
authorEvan Prodromou <evan@status.net>
Sun, 10 Jan 2010 22:18:54 +0000 (14:18 -0800)
committerEvan Prodromou <evan@status.net>
Sun, 10 Jan 2010 22:18:54 +0000 (14:18 -0800)
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. :-)