]> 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: 22c806a 0f2c43b)
Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk into 0.7.x
authorEvan Prodromou <evan@controlyourself.ca>
Tue, 3 Feb 2009 20:12:55 +0000 (15:12 -0500)
committerEvan Prodromou <evan@controlyourself.ca>
Tue, 3 Feb 2009 20:12:55 +0000 (15:12 -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. :-)