diff options
| author | Anika Henke <anika@selfthinker.org> | 2014-01-26 17:38:22 +0000 |
|---|---|---|
| committer | Anika Henke <anika@selfthinker.org> | 2014-01-26 17:38:22 +0000 |
| commit | 8fe276f7d4bf70c4a798e1c5e7bb3da72a33877d (patch) | |
| tree | 1e3ce9edacc852741af07c070176bd04fb61c4b4 /inc/farm.php | |
| parent | c5393ecb1aa570830d21e9dc95b4c21cd9aa9c01 (diff) | |
| parent | ca605ff6763b98b580278988791dc5e57fc05a74 (diff) | |
| download | rpg-8fe276f7d4bf70c4a798e1c5e7bb3da72a33877d.tar.gz rpg-8fe276f7d4bf70c4a798e1c5e7bb3da72a33877d.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into video-audio
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', |