diff options
| author | Zach Copley <zach@controlyourself.ca> | 2009-06-17 21:40:52 +0000 |
|---|---|---|
| committer | Zach Copley <zach@controlyourself.ca> | 2009-06-17 21:40:52 +0000 |
| commit | 164588ef0fd2c9c9f1858f1d21d6758356ce7885 (patch) | |
| tree | 2e5d5c9cc8adf07a1d610728dbfa201756884640 /lib/common.php | |
| parent | af4b18b1e2ef8aded26fc4788c571012da04d1cf (diff) | |
| parent | cd1361fe960eb3afbbdb34b14061b8475dea60c8 (diff) | |
Merge branch '0.8.x' into userdesign
Diffstat (limited to 'lib/common.php')
| -rw-r--r-- | lib/common.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/common.php b/lib/common.php index bcf2e5d0c..eb8a2b873 100644 --- 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'); |