From 5ce45d1a948bd965f63c333d8f2ed0f76f74cc92 Mon Sep 17 00:00:00 2001
From: Thomas Steur <thomas.steur@googlemail.com>
Date: Wed, 2 Jul 2014 04:23:42 +0200
Subject: added development flag which allows us to not cache static cache and
 to make some more checks when developers develop plugins

---
 core/AssetManager.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'core/AssetManager.php')

diff --git a/core/AssetManager.php b/core/AssetManager.php
index 4bf29afef0..1badba4d9e 100644
--- a/core/AssetManager.php
+++ b/core/AssetManager.php
@@ -273,7 +273,7 @@ class AssetManager extends Singleton
      */
     public function isMergedAssetsDisabled()
     {
-        return Config::getInstance()->Debug['disable_merged_assets'];
+        return Config::getInstance()->Development['disable_merged_assets'];
     }
 
     /**
-- 
cgit v1.2.3