]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge commit 'origin/testing' into 0.9.x
authorBrion Vibber <brion@pobox.com>
Thu, 4 Mar 2010 14:07:28 +0000 (06:07 -0800)
committerBrion Vibber <brion@pobox.com>
Thu, 4 Mar 2010 14:07:28 +0000 (06:07 -0800)
commitb218aee94e581230e1efa14d4ae1a19756986ddf
treea832ddf3b4322b520fd20c4d8ea2d31720c3679b
parent358556057a87c0cb9291223a2026782e6548ff2e
parent14d7f4a598d0e24467fe3eafd9a02b0e651edad8
Merge commit 'origin/testing' into 0.9.x

Conflicts:
lib/action.php
lib/adminpanelaction.php
classes/File.php
classes/User.php
classes/User_group.php
index.php
lib/action.php
lib/adminpanelaction.php
lib/default.php
plugins/Facebook/FacebookPlugin.php
plugins/OStatus/OStatusPlugin.php