]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch '0.7.x' of git@gitorious.org:laconica/dev
authorEvan Prodromou <evan@controlyourself.ca>
Wed, 1 Apr 2009 18:40:58 +0000 (14:40 -0400)
committerEvan Prodromou <evan@controlyourself.ca>
Wed, 1 Apr 2009 18:40:58 +0000 (14:40 -0400)
commit3bec08c878d50cfa43ffb72466842bda5dd88171
treeabb5c38a0567dfb9af37c68801832b8bb56e9335
parent783d292739886811ab41215c614940d24214358f
parente7381493ad036e686f82f432066f00ff911ad5d5
Merge branch '0.7.x' of git@gitorious.org:laconica/dev

Conflicts:
README
lib/router.php
lib/util.php