]> 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: da4f8d4 bacc3d2)
Merge branch '0.9.x' into minifyjs
authorEvan Prodromou <evan@status.net>
Wed, 17 Nov 2010 17:19:19 +0000 (12:19 -0500)
committerEvan Prodromou <evan@status.net>
Wed, 17 Nov 2010 17:19:19 +0000 (12:19 -0500)
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. :-)