diff options
| author | Guy Brand <gb@unistra.fr> | 2015-08-10 10:03:27 +0200 |
|---|---|---|
| committer | Guy Brand <gb@unistra.fr> | 2015-08-10 10:03:27 +0200 |
| commit | 53a57d16b9c741bb44099fd93bf79efa06796341 (patch) | |
| tree | 24a90a50afe9325926c8ebaa2ed90f9fa093e5b9 /inc/config_cascade.php | |
| parent | cf6e6645c31a9f185cef3fb9452fb188882ede47 (diff) | |
| parent | a060d9973e7c1d5051f2cc426937881826e4972e (diff) | |
| download | rpg-53a57d16b9c741bb44099fd93bf79efa06796341.tar.gz rpg-53a57d16b9c741bb44099fd93bf79efa06796341.tar.bz2 | |
Merge branch master into stable
Diffstat (limited to 'inc/config_cascade.php')
| -rw-r--r-- | inc/config_cascade.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/inc/config_cascade.php b/inc/config_cascade.php index 1d9f67edb..a6dfadc80 100644 --- a/inc/config_cascade.php +++ b/inc/config_cascade.php @@ -49,13 +49,13 @@ $config_cascade = array_merge( 'local' => array(DOKU_CONF . 'wordblock.local.conf'), ), 'userstyle' => array( - 'screen' => DOKU_CONF . 'userstyle.css', - 'print' => DOKU_CONF . 'userprint.css', - 'feed' => DOKU_CONF . 'userfeed.css', - 'all' => DOKU_CONF . 'userall.css', + 'screen' => array(DOKU_CONF . 'userstyle.css', DOKU_CONF . 'userstyle.less'), + 'print' => array(DOKU_CONF . 'userprint.css', DOKU_CONF . 'userprint.less'), + 'feed' => array(DOKU_CONF . 'userfeed.css', DOKU_CONF . 'userfeed.less'), + 'all' => array(DOKU_CONF . 'userall.css', DOKU_CONF . 'userall.less') ), 'userscript' => array( - 'default' => DOKU_CONF . 'userscript.js' + 'default' => array(DOKU_CONF . 'userscript.js') ), 'acl' => array( 'default' => DOKU_CONF . 'acl.auth.php', |