]> 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: e00508d 1fbf9a0)
Merge branch 'master' into 0.7.x
authorEvan Prodromou <evan@controlyourself.ca>
Tue, 31 Mar 2009 14:14:54 +0000 (10:14 -0400)
committerEvan Prodromou <evan@controlyourself.ca>
Tue, 31 Mar 2009 14:14:54 +0000 (10:14 -0400)
Conflicts:
README
lib/router.php


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