]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge commit 'origin/0.9.x' into 0.9.x
authorBrenda Wallace <shiny@cpan.org>
Sat, 6 Mar 2010 20:30:07 +0000 (09:30 +1300)
committerBrenda Wallace <shiny@cpan.org>
Sat, 6 Mar 2010 20:30:07 +0000 (09:30 +1300)
commitc89ed16d24d56879bf40a70d500509d1d42a4532
tree37fcb6063ebaf0ff3274ac4d264f3f9144f0a46c
parente97515c8779705bf732840df0611cc2025a4781f
parentef3b849db05ff6ad4b9e97b38a82242a710519d1
Merge commit 'origin/0.9.x' into 0.9.x

Conflicts:
lib/schema.php
config.php.sample