]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge commit 'refs/merge-requests/157' of git://gitorious.org/statusnet/mainline...
authorZach Copley <zach@status.net>
Thu, 7 Jul 2011 22:58:28 +0000 (15:58 -0700)
committerZach Copley <zach@status.net>
Thu, 7 Jul 2011 22:58:28 +0000 (15:58 -0700)
commitcb183359e23ae7a5cfb483fa06c6c4b7a8b05fff
treeac7055eea9ec91732b9258a3e75310d8913e651a
parent069d976fab355be974ce589d5d04494c4c9e000e
parent3c47d158f4b012a74577eabae344b53ff88c7c6f
Merge commit 'refs/merge-requests/157' of git://gitorious.org/statusnet/mainline into merge-requests/157
actions/hostmeta.php
actions/userxrd.php
config.php.sample
lib/default.php