diff options
| author | mattab <matthieu.aubry@gmail.com> | 2014-02-17 04:16:13 +0400 |
|---|---|---|
| committer | mattab <matthieu.aubry@gmail.com> | 2014-02-17 04:16:13 +0400 |
| commit | 3551686fdaf9f97a923b9712c9f8f419cb9cfae1 (patch) | |
| tree | 7e7e9d28a239d330c1e5f4357e90787fb11bc9b5 /config | |
| parent | fa04cb406bb19c3a1904a1482beda1ff5f3f2a85 (diff) | |
| parent | 3da7d94126c97b9e552c9bc8de658c4d8cf5691a (diff) | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'config')
| -rw-r--r-- | config/global.ini.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/config/global.ini.php b/config/global.ini.php index decf36869e..a06950d8b7 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' |