diff options
| author | Brion Vibber <brion@pobox.com> | 2010-03-22 13:56:16 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-03-22 13:56:16 -0700 |
| commit | e89908f26140c217e01b2f8f755712f38f3935f3 (patch) | |
| tree | 6b241fc2e33f3528cf48b415ef67906826b02e24 /plugins/TwitterBridge/README | |
| parent | 714d920faea302b55857cc3bec4e9e6160ea136a (diff) | |
| parent | eb563937df921e5fc67ca0c87e229feb2907fd19 (diff) | |
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 1.0.x
Conflicts:
lib/channel.php
scripts/imdaemon.php
Diffstat (limited to 'plugins/TwitterBridge/README')
| -rw-r--r-- | plugins/TwitterBridge/README | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/TwitterBridge/README b/plugins/TwitterBridge/README index d0d34b7ef..d7dfe20de 100644 --- a/plugins/TwitterBridge/README +++ b/plugins/TwitterBridge/README @@ -59,8 +59,8 @@ unless you configure it with a consumer key and secret.) secret. The Twitter bridge will fall back on the global key pair if it can't find a local pair, e.g.: - $config['twitter']['global_consumer_key'] = 'YOUR_CONSUMER_KEY' - $config['twitter']['global_consumer_secret'] = 'YOUR_CONSUMER_SECRET' + $config['twitter']['global_consumer_key'] = 'YOUR_CONSUMER_KEY'; + $config['twitter']['global_consumer_secret'] = 'YOUR_CONSUMER_SECRET'; Administration panel -------------------- |