diff options
| author | Evan Prodromou <evan@status.net> | 2010-03-02 02:56:57 -0500 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2010-03-02 02:56:57 -0500 |
| commit | f504a9237e64c49286b355de87ea59abe14b1090 (patch) | |
| tree | a0ce30d9099954ac912e450f1f8f01c6b9fb25d3 /lib/default.php | |
| parent | 2c677e0f2d881f0c9f5713fcbc37ad24ef0dab26 (diff) | |
| parent | 40e1b249cf1535a6074c8b32e5820c8ad6427836 (diff) | |
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
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 d849055c2..7b50242ae 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), |