Merge branch '0.8.x' into userdesign

[quix0rs-gnu-social.git] / lib / common.php

diff --git a/lib/common.php b/lib/common.php
index bcf2e5d0c7dfaefa0bc8e3ab266cc50ed7007888..eb8a2b8736cab98b153d217c73bcf075d390e9f1 100644 (file)
--- a/lib/common.php
+++ b/lib/common.php
@@ -213,9 +213,11 @@ $config =
         'file_quota' => 5000000,
         'user_quota' => 50000000,
         'monthly_quota' => 15000000,
+        'uploads' => true,
         ),
         'group' =>
         array('maxaliases' => 3),
+        'oohembed' => array('endpoint' => 'http://oohembed.com/oohembed/')
         );
 
 $config['db'] = &PEAR::getStaticProperty('DB_DataObject','options');