]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch 'testing' into 0.9.x
authorBrion Vibber <brion@pobox.com>
Thu, 29 Apr 2010 22:14:51 +0000 (15:14 -0700)
committerBrion Vibber <brion@pobox.com>
Thu, 29 Apr 2010 22:14:51 +0000 (15:14 -0700)
commit2260d6ec7c1f2b9c63196a4d8c6c99750a89eb10
treecac824e9986caf03fd43bd967663ab1ef4b8bede
parent42348bc16711316918efef634d6d83bf19b0b1fe
parent50d5f5e04c9c37eb5ba20e1dbcd8ceb832d8be81
Merge branch 'testing' into 0.9.x

Conflicts:
index.php
classes/Notice.php
lib/activity.php