summaryrefslogtreecommitdiff
path: root/install.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-04-01 14:40:58 -0400
committerEvan Prodromou <evan@controlyourself.ca>2009-04-01 14:40:58 -0400
commit3bec08c878d50cfa43ffb72466842bda5dd88171 (patch)
treeabb5c38a0567dfb9af37c68801832b8bb56e9335 /install.php
parent783d292739886811ab41215c614940d24214358f (diff)
parente7381493ad036e686f82f432066f00ff911ad5d5 (diff)
Merge branch '0.7.x' of git@gitorious.org:laconica/dev
Conflicts: README lib/router.php
Diffstat (limited to 'install.php')
0 files changed, 0 insertions, 0 deletions