]> 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: 36bb33f e239a55)
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
authorZach Copley <zach@controlyourself.ca>
Thu, 5 Mar 2009 00:21:37 +0000 (16:21 -0800)
committerZach Copley <zach@controlyourself.ca>
Thu, 5 Mar 2009 00:21:37 +0000 (16:21 -0800)
1  2 
lib/router.php patch | diff1 | diff2 | blob | history

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