Merge branch 'twitter-oauth' into 0.8.x

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

diff --git a/lib/common.php b/lib/common.php
index be30519f47409bb7e7eefa6ae92e60379e9b7910..645ae8c3442c5f2aa58b5ddaba0d1f80a79072a8 100644 (file)
--- a/lib/common.php
+++ b/lib/common.php
@@ -194,6 +194,9 @@ $config =
         'integration' =>
         array('source' => 'Laconica', # source attribute for Twitter
               'taguri' => $_server.',2009'), # base for tag URIs
+       'twitter' =>
+       array('consumer_key'    => null,
+             'consumer_secret' => null),
         'memcached' =>
         array('enabled' => false,
               'server' => 'localhost',