diff options
| author | Evan Prodromou <evan@status.net> | 2010-03-13 06:36:25 -0600 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2010-03-13 06:36:25 -0600 |
| commit | c1e96cbdefa66e66815c421378b9452d7c8d5548 (patch) | |
| tree | a08e80d705d08ffb33233991bf80e7c19867552a /config.php.sample | |
| parent | a2cc26ba8a21aa3614ebfc4a77c0bec9ffb2655d (diff) | |
| parent | 9e9ab23e1f936eb62014d8f7b0051f0314ae482c (diff) | |
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'config.php.sample')
| -rw-r--r-- | config.php.sample | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/config.php.sample b/config.php.sample index 3d2a52bec..20de7ffed 100644 --- a/config.php.sample +++ b/config.php.sample @@ -197,7 +197,7 @@ $config['sphinx']['port'] = 3312; // // $config['twitterimport']['enabled'] = true; -// Twitter OAuth settings +// Twitter OAuth settings. Documentation is at http://apiwiki.twitter.com/OAuth-FAQ // $config['twitter']['consumer_key'] = 'YOURKEY'; // $config['twitter']['consumer_secret'] = 'YOURSECRET'; @@ -268,6 +268,8 @@ $config['sphinx']['port'] = 3312; // Support for file uploads (attachments), // select supported mimetypes and quotas (in bytes) // $config['attachments']['supported'] = array('image/png', 'application/ogg'); +// $config['attachments']['supported'] = true; //allow all file types to be uploaded + // $config['attachments']['file_quota'] = 5000000; // $config['attachments']['user_quota'] = 50000000; // $config['attachments']['monthly_quota'] = 15000000; |