diff options
| author | Tim Roes <mail@timroes.de> | 2012-05-07 17:08:35 +0200 |
|---|---|---|
| committer | Tim Roes <mail@timroes.de> | 2012-05-07 17:08:35 +0200 |
| commit | efa78c8638547cab77a37006e7f86aed792a1609 (patch) | |
| tree | 492804d80b28f8e32785b3648d9e03e77804b50f /inc/config_cascade.php | |
| parent | ae992f53831c105d6deacfef79d7723b22a00033 (diff) | |
| parent | f774b92a94947b3eabd64919b6b4ba74f9c4b5fd (diff) | |
| download | rpg-efa78c8638547cab77a37006e7f86aed792a1609.tar.gz rpg-efa78c8638547cab77a37006e7f86aed792a1609.tar.bz2 | |
Merge branch 'master' of https://github.com/splitbrain/dokuwiki
Diffstat (limited to 'inc/config_cascade.php')
| -rw-r--r-- | inc/config_cascade.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/inc/config_cascade.php b/inc/config_cascade.php index 79567fc56..e4a3df353 100644 --- a/inc/config_cascade.php +++ b/inc/config_cascade.php @@ -66,6 +66,7 @@ $config_cascade = array_merge( ), 'plugins' => array( + 'default' => array(DOKU_CONF.'plugins.php'), 'local' => array(DOKU_CONF.'plugins.local.php'), 'protected' => array( DOKU_CONF.'plugins.required.php', |