diff options
| author | Zach Copley <zach@controlyourself.ca> | 2009-08-10 07:49:51 +0000 |
|---|---|---|
| committer | Zach Copley <zach@controlyourself.ca> | 2009-08-10 07:49:51 +0000 |
| commit | 17dcf1c3170bc905e3b0fdffc804d6f7229ac61b (patch) | |
| tree | 6a236c91314d3576b19493e42a9773a7610cce69 /lib/common.php | |
| parent | c1b19929f6234c4b9e30e16bae419c89c38c1169 (diff) | |
| parent | 06c5f490ea509f3a5222f42ee561c9b4f337af8e (diff) | |
Merge branch 'twitter-oauth' into 0.8.x
Conflicts:
scripts/getvaliddaemons.php
Diffstat (limited to 'lib/common.php')
| -rw-r--r-- | lib/common.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/common.php b/lib/common.php index be30519f4..645ae8c34 100644 --- a/lib/common.php +++ b/lib/common.php @@ -194,6 +194,9 @@ $config = 'integration' => array('source' => 'Laconica', # source attribute for Twitter 'taguri' => $_server.',2009'), # base for tag URIs + 'twitter' => + array('consumer_key' => null, + 'consumer_secret' => null), 'memcached' => array('enabled' => false, 'server' => 'localhost', |