diff options
author | Brion Vibber <brion@pobox.com> | 2010-03-02 13:38:10 -0800 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-03-02 13:38:10 -0800 |
commit | ddf3614c843bcd8d9ecfd0850ac9a8cefae6dbba (patch) | |
tree | 07b772b280e6f23761c0111d953b3c2f5b8d2120 /lib/default.php | |
parent | 8629664ed90ffb496f607d15491821217f6b3126 (diff) | |
parent | e9c127ddd869f44eafe7ae6b30d9dc69df8b863c (diff) |
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'lib/default.php')
-rw-r--r-- | lib/default.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/default.php b/lib/default.php index b06b96157..7b97c7dda 100644 --- a/lib/default.php +++ b/lib/default.php @@ -177,8 +177,8 @@ $default = array('source' => 'StatusNet', # source attribute for Twitter 'taguri' => null), # base for tag URIs 'twitter' => - array('enabled' => true, - 'consumer_key' => null, + array('signin' => true, + 'consumer_key' => null, 'consumer_secret' => null), 'cache' => array('base' => null), |