]> 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: 1fdb35b 85694e3)
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
authorZach Copley <zach@controlyourself.ca>
Sat, 21 Feb 2009 01:19:08 +0000 (17:19 -0800)
committerZach Copley <zach@controlyourself.ca>
Sat, 21 Feb 2009 01:19:08 +0000 (17:19 -0800)
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. :-)