diff options
| author | Evan Prodromou <evan@status.net> | 2010-09-22 10:45:34 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2010-09-22 10:45:34 -0400 |
| commit | b5cfcba4712809cb17eabba299ce5ff04f4d7d70 (patch) | |
| tree | 38235bafd6ddf194e484b97321c0c341bea9de38 /lib/default.php | |
| parent | 91a186251047127ad7f1238f47ff761d9127627c (diff) | |
| parent | f0105893b0b78ff88d08cc2417773ad8a44dc2fa (diff) | |
Merge branch '0.9.x' into activityexport
Conflicts:
plugins/OStatus/OStatusPlugin.php
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 45a4560ff..6200abada 100644 --- a/lib/default.php +++ b/lib/default.php @@ -300,7 +300,7 @@ $default = 'OpenID' => null), ), 'admin' => - array('panels' => array('design', 'site', 'user', 'paths', 'access', 'sessions', 'sitenotice')), + array('panels' => array('design', 'site', 'user', 'paths', 'access', 'sessions', 'sitenotice', 'license')), 'singleuser' => array('enabled' => false, 'nickname' => null), |