diff options
author | Guy Brand <gb@unistra.fr> | 2013-11-18 20:48:03 +0100 |
---|---|---|
committer | Guy Brand <gb@unistra.fr> | 2013-11-18 20:48:03 +0100 |
commit | 9d6d3a45521ca9b4eecc9f264a6adfe12d2ed764 (patch) | |
tree | d87417a2562e14e40f21012a9e1ede2d159239c5 /inc/farm.php | |
parent | 0f71b9e8c36a27b7e476b43879f1cf9636a9958e (diff) | |
parent | 14b3007921f7b66fc9e3621b861a3c83e7e9093c (diff) | |
download | rpg-9d6d3a45521ca9b4eecc9f264a6adfe12d2ed764.tar.gz rpg-9d6d3a45521ca9b4eecc9f264a6adfe12d2ed764.tar.bz2 |
Merge branch 'master' into stable
Diffstat (limited to 'inc/farm.php')
-rw-r--r-- | inc/farm.php | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/inc/farm.php b/inc/farm.php index 54692928d..cee61816c 100644 --- a/inc/farm.php +++ b/inc/farm.php @@ -135,9 +135,7 @@ $config_cascade = array( ), ), 'userstyle' => array( - 'default' => DOKU_CONF.'userstyle.css', // 'default' was renamed to 'screen' on 2011-02-26, so will be deprecated in the next version 'screen' => DOKU_CONF.'userstyle.css', - 'rtl' => DOKU_CONF.'userrtl.css', // deprecated since version after 2012-04-09 'print' => DOKU_CONF.'userprint.css', 'feed' => DOKU_CONF.'userfeed.css', 'all' => DOKU_CONF.'userall.css', |