]> 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: 568cb8a ca48963)
Merge remote branch 'gitorious/1.0.x' into 1.0.x
authorEvan Prodromou <evan@status.net>
Tue, 26 Oct 2010 13:22:21 +0000 (09:22 -0400)
committerEvan Prodromou <evan@status.net>
Tue, 26 Oct 2010 13:22:21 +0000 (09:22 -0400)
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. :-)