]> 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: d840578 0330bad)
Merge branch '0.9.x' into righttoleave
authorEvan Prodromou <evan@status.net>
Wed, 15 Dec 2010 21:48:28 +0000 (16:48 -0500)
committerEvan Prodromou <evan@status.net>
Wed, 15 Dec 2010 21:48:28 +0000 (16:48 -0500)
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. :-)