]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch 'testing' into 0.9.x
authorBrion Vibber <brion@pobox.com>
Wed, 16 Jun 2010 19:38:35 +0000 (12:38 -0700)
committerBrion Vibber <brion@pobox.com>
Wed, 16 Jun 2010 19:38:35 +0000 (12:38 -0700)
commit9684cbe3c6d61be0b1cc2094bc4278cd8a21b33e
tree46a52783103529ccd52b4a5af5347df35cf9f894
parent7f3b3620af2af88ced37da1d9f8913cfd1a31b90
parentd65d9826811c5e9b2aec01aa89abffbfbee535f8
Merge branch 'testing' into 0.9.x

Conflicts:
plugins/OpenID/openidserver.php
lib/installer.php
plugins/OpenID/openidserver.php