]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch '0.8.x' into 0.9.x
authorEvan Prodromou <evan@status.net>
Tue, 13 Oct 2009 21:25:54 +0000 (17:25 -0400)
committerEvan Prodromou <evan@status.net>
Tue, 13 Oct 2009 21:25:54 +0000 (17:25 -0400)
commit67c387c6a0dc80a5c9beac9d73717763a2ba96f4
tree5f03f3939c3ca71f4b9088abf6c3fcdb0f4a6c3f
parent181de862efe2da16164daea32b74c3da8ea2ed7e
parentbf4626ddf6362b81d1ce23a5cc300b4d5694c146
Merge branch '0.8.x' into 0.9.x

Conflicts:
install.php
install.php