Merge branch '0.8.x' into twitter-oauth

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

diff --git a/lib/common.php b/lib/common.php
index b3d3018620a15d889f02a6183e72192241a03725..becd250b061d1c5d9a5657cacb3729a455bb214a 100644 (file)
--- a/lib/common.php
+++ b/lib/common.php
@@ -188,6 +188,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',