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:
authorFabian Becker <halfdan@xnorfz.de>2013-01-29 22:23:16 +0400
committerFabian Becker <halfdan@xnorfz.de>2013-01-29 22:23:16 +0400
commit922ad806d8e469192d7121361711d7c0b010fb4b (patch)
tree3037ebce49856e0154a25995f3dd82ba3e64a588 /config
parent388792fc912351eb32f194bb96a0c4f2c46a41fd (diff)
That wasn't supposed to be in there.
refs #1552 git-svn-id: http://dev.piwik.org/svn/trunk@7816 59fd770c-687e-43c8-a1e3-f5a4ff64c105
Diffstat (limited to 'config')
-rw-r--r--config/global.ini.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/global.ini.php b/config/global.ini.php
index f448840403..276d6fcfa6 100644
--- a/config/global.ini.php
+++ b/config/global.ini.php
@@ -56,7 +56,7 @@ track_visits_inside_piwik_ui = 0
; if set to 1, javascript and css files will be included individually
; this option must be set to 1 when adding, removing or modifying javascript and css files
-disable_merged_assets = 1
+disable_merged_assets = 0
; If set to 1, all requests to piwik.php will be forced to be 'new visitors'
tracker_always_new_visitor = 0