Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorThomas Steur <tsteur@users.noreply.github.com>2014-02-17 04:05:06 +0400
committerThomas Steur <tsteur@users.noreply.github.com>2014-02-17 04:05:06 +0400
commit3da7d94126c97b9e552c9bc8de658c4d8cf5691a (patch)
tree307f6cf05b090b671139878794606d7a6b975018 /config
parent07305105e4c5050412be11f914d58d0e840e9912 (diff)
refs #4655 updated description of merged assets setting
Diffstat (limited to 'config')
-rw-r--r--config/global.ini.php5
1 files changed, 2 insertions, 3 deletions
diff --git a/config/global.ini.php b/config/global.ini.php
index c8049e52f3..fec0c79346 100644
--- a/config/global.ini.php
+++ b/config/global.ini.php
@@ -76,9 +76,8 @@ enable_sql_profiler = 0
; this is useful for Piwik developers as an easy way to create data in their local Piwik
track_visits_inside_piwik_ui = 0
-; if set to 1, javascript files will be included individually and the css will be regenerated from the less
-; files when they change
-; this option must be set to 1 when adding, removing or modifying javascript and less files
+; if set to 1, javascript files will be included individually and neither merged nor minified.
+; this option must be set to 1 when adding, removing or modifying javascript files
disable_merged_assets = 0
; If set to 1, all requests to piwik.php will be forced to be 'new visitors'