]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch 'sessionidparam' into 0.9.x
authorEvan Prodromou <evan@status.net>
Mon, 11 Jan 2010 08:45:26 +0000 (00:45 -0800)
committerEvan Prodromou <evan@status.net>
Mon, 11 Jan 2010 08:45:26 +0000 (00:45 -0800)
commit8809e577b2c8cf1b8b187840aaf9674136929ec7
tree28ed1e16f26d55510402f928ed9e484f0670cf01
parentad63a9518cb77d548e61fb39d05f8066733c326d
parent92deb35bc4dbd4203bce93bffec4cfb58eab032c
Merge branch 'sessionidparam' into 0.9.x

Conflicts:
lib/command.php
actions/register.php
lib/router.php
lib/util.php