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

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

diff --git a/lib/default.php b/lib/default.php
index 76e4e44cf2b17a43e57c86a68eae916f6353a98b..79b54fc3bddb8e216a2efd8a62d2de847fc2d1c5 100644 (file)
--- a/lib/default.php
+++ b/lib/default.php
@@ -299,10 +299,11 @@ $default =
                                  'RSSCloud' => null,
                                  'ClientSideShorten' => null,
                                  'OpenID' => null),
+              'locale_path' => false, // Set to a path to use *instead of* each plugin's own locale subdirectories
               ),
         'pluginlist' => array(),
         'admin' =>
-        array('panels' => array('design', 'site', 'user', 'paths', 'access', 'sessions', 'sitenotice', 'plugins')),
+        array('panels' => array('design', 'site', 'user', 'paths', 'access', 'sessions', 'sitenotice', 'license', 'plugins')),
         'singleuser' =>
         array('enabled' => false,
               'nickname' => null),