]> 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: 5d56dba baae319)
Merge branch '0.9.x' into activityatompub
authorEvan Prodromou <evan@status.net>
Fri, 10 Dec 2010 22:04:55 +0000 (17:04 -0500)
committerEvan Prodromou <evan@status.net>
Fri, 10 Dec 2010 22:04:55 +0000 (17:04 -0500)
Conflicts:
lib/router.php

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. :-)