]> 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: 388495f 1bfbe9b)
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
authorEvan Prodromou <evan@status.net>
Fri, 3 Sep 2010 02:56:18 +0000 (22:56 -0400)
committerEvan Prodromou <evan@status.net>
Fri, 3 Sep 2010 02:56:18 +0000 (22:56 -0400)
1  2 
lib/action.php patch | diff1 | diff2 | blob | history

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