]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
fix merge conflict 0.7.x 0.8.x in util.php and register.php.
authorRobin Millette <millette@controlyourself.ca>
Fri, 17 Apr 2009 17:04:05 +0000 (17:04 +0000)
committerRobin Millette <millette@controlyourself.ca>
Fri, 17 Apr 2009 17:04:05 +0000 (17:04 +0000)
commite5094c3359fb74caeea474f8e08eb0d15b477652
tree9d60785414e80a5bad75e3e45ab542a0c9f0352b
parent55d7bb4701ca39fb8f4b859b19defdfc7af0142c
parent2eb1eb86838b47af7305dbd21a181e63bcd58418
fix merge conflict 0.7.x 0.8.x in util.php and register.php.
README
actions/register.php
lib/util.php