Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

[quix0rs-gnu-social.git] / lib / default.php

diff --git a/lib/default.php b/lib/default.php
index 9ab8305ed928fe3797a2d4255103ffc62b482760..30e43eefbd65394762bd0a5d4d447603b75997a3 100644 (file)
--- 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