Merge branch '1.0.x' into schema-x

2010-10-13 15:46:45 -07:00
parent 621233e1ad f79dbaf9a7
commit 4101de7dd7
322 changed files with 8582 additions and 3089 deletions
--- a/plugins/OStatus/classes/Ostatus_profile.php
+++ b/plugins/OStatus/classes/Ostatus_profile.php
@@ -17,6 +17,10 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
 /**
 * @package OStatusPlugin
 * @maintainer Brion Vibber <brion@status.net>