]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch 'testing' into 0.9.x
authorBrion Vibber <brion@pobox.com>
Thu, 4 Mar 2010 18:16:59 +0000 (10:16 -0800)
committerBrion Vibber <brion@pobox.com>
Thu, 4 Mar 2010 18:16:59 +0000 (10:16 -0800)
commitf969d6349c244e2ec32c3ebe7eb355426006f4db
treeb66cd619681ffd868178ae3d4b8f6103adcc036e
parentb218aee94e581230e1efa14d4ae1a19756986ddf
parentb720c7554be2a8e15c3772fe1071c48cf91935d6
Merge branch 'testing' into 0.9.x

Conflicts:
db/08to09.sql
lib/adminpanelaction.php
lib/default.php
plugins/OStatus/OStatusPlugin.php