diff options
| author | Zach Copley <zcopley@mekong.(none)> | 2009-06-17 14:36:33 -0700 |
|---|---|---|
| committer | Zach Copley <zcopley@mekong.(none)> | 2009-06-17 14:36:33 -0700 |
| commit | cd1361fe960eb3afbbdb34b14061b8475dea60c8 (patch) | |
| tree | c043f10b3e73865985f3ce2f9252925e004a46f0 /lib/common.php | |
| parent | 8992e8fa7a3c694cc9d424b3e50cf4d87519fa28 (diff) | |
| parent | b58dc5e96117bdb4de899d37c6eb94ebf1c3dfe6 (diff) | |
Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x
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 51204cede..bbd9f78c3 100644 --- a/lib/common.php +++ b/lib/common.php @@ -200,9 +200,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'); |