summaryrefslogtreecommitdiff
path: root/config.php.sample
diff options
context:
space:
mode:
authorZach Copley <zach@controlyourself.ca>2009-08-10 07:49:51 +0000
committerZach Copley <zach@controlyourself.ca>2009-08-10 07:49:51 +0000
commit17dcf1c3170bc905e3b0fdffc804d6f7229ac61b (patch)
tree6a236c91314d3576b19493e42a9773a7610cce69 /config.php.sample
parentc1b19929f6234c4b9e30e16bae419c89c38c1169 (diff)
parent06c5f490ea509f3a5222f42ee561c9b4f337af8e (diff)
Merge branch 'twitter-oauth' into 0.8.x
Conflicts: scripts/getvaliddaemons.php
Diffstat (limited to 'config.php.sample')
-rw-r--r--config.php.sample4
1 files changed, 4 insertions, 0 deletions
diff --git a/config.php.sample b/config.php.sample
index 21b6865e1..c2dcf8516 100644
--- a/config.php.sample
+++ b/config.php.sample
@@ -182,6 +182,10 @@ $config['sphinx']['port'] = 3312;
//
// $config['twitterbridge']['enabled'] = true;
+// Twitter OAuth settings
+// $config['twitter']['consumer_key'] = 'YOURKEY';
+// $config['twitter']['consumer_secret'] = 'YOURSECRET';
+
// Edit throttling. Off by default. If turned on, you can only post 20 notices
// every 10 minutes. Admins may want to play with the settings to minimize inconvenience for
// real users without getting uncontrollable floods from spammers or runaway bots.