diff options
| author | Evan Prodromou <evan@status.net> | 2009-10-21 22:41:42 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2009-10-21 22:41:42 -0400 |
| commit | 4e639b8769f42e700b9ad3abe5564ddb0178501c (patch) | |
| tree | f1ccb3017bf2ba0a79a4562cd36c2b61276a4a07 /lib/default.php | |
| parent | 0df85711d6b2b02f8857e9d1b51fda4183be8bf3 (diff) | |
| parent | 5e536a66141fac332e77c5ea6e85aee6a9347ace (diff) | |
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'lib/default.php')
| -rw-r--r-- | lib/default.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/default.php b/lib/default.php index 9ab8305ed..30e43eefb 100644 --- a/lib/default.php +++ b/lib/default.php @@ -140,7 +140,7 @@ $default = array('enabled' => true), 'sms' => array('enabled' => true), - 'twitterbridge' => + 'twitterimport' => array('enabled' => false), 'integration' => array('source' => 'StatusNet', # source attribute for Twitter |