diff options
| author | Brenda Wallace <shiny@cpan.org> | 2010-03-07 09:30:07 +1300 |
|---|---|---|
| committer | Brenda Wallace <shiny@cpan.org> | 2010-03-07 09:30:07 +1300 |
| commit | c89ed16d24d56879bf40a70d500509d1d42a4532 (patch) | |
| tree | 37fcb6063ebaf0ff3274ac4d264f3f9144f0a46c /config.php.sample | |
| parent | e97515c8779705bf732840df0611cc2025a4781f (diff) | |
| parent | ef3b849db05ff6ad4b9e97b38a82242a710519d1 (diff) | |
Merge commit 'origin/0.9.x' into 0.9.x
Conflicts:
lib/schema.php
Diffstat (limited to 'config.php.sample')
| -rw-r--r-- | config.php.sample | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config.php.sample b/config.php.sample index 9e0b4e2ac..a4580dabb 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'; |