]> 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: abf2ce8 29a2584)
Merge commit 'origin'; branch '0.9.x' into 1.0.x
authorBrion Vibber <brion@pobox.com>
Thu, 25 Mar 2010 20:05:02 +0000 (13:05 -0700)
committerBrion Vibber <brion@pobox.com>
Thu, 25 Mar 2010 20:05:02 +0000 (13:05 -0700)
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. :-)