diff options
| author | Evan Prodromou <evan@controlyourself.ca> | 2009-06-17 15:05:24 -0700 |
|---|---|---|
| committer | Evan Prodromou <evan@controlyourself.ca> | 2009-06-17 15:05:24 -0700 |
| commit | 420e8994f8f62c22073e70e081daadfa2d8d7c06 (patch) | |
| tree | 67aaba76513bc1f60382beab2223c32c80f942a9 /lib/common.php | |
| parent | 07f5797f2fd1a425027190d424e359a1b4c4c8be (diff) | |
| parent | cd1361fe960eb3afbbdb34b14061b8475dea60c8 (diff) | |
Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into taggedprofile
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'); |