Merge branch 'hotfix/27'

Close zfcampus#27
weierophinney · Dec 7, 2013 · ce329d5 · ce329d5
2 parents 8f9a4c4 + 7444b2f
commit ce329d5
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 1 deletion.
diff --git a/composer.json b/composer.json
@@ -41,6 +41,7 @@
         "zendframework/zftool": "dev-master",
         "zendframework/zend-developer-tools": "dev-master",
         "zfcampus/zf-apigility-admin": "~1.0-dev",
+        "zfcampus/zf-configuration": "~1.0-dev",
         "zfcampus/zf-apigility-welcome": "~1.0-dev"
     }
 }
diff --git a/config/application.config.php b/config/application.config.php
@@ -19,7 +19,6 @@
         'ZF\ContentValidation',
         'ZF\Rest',
         'ZF\Rpc',
-        'ZF\Configuration',
         'ZF\Versioning',
     ),
     // This should be an array of paths in which modules reside.

diff --git a/config/development.config.php.dist b/config/development.config.php.dist
@@ -9,6 +9,7 @@ return array(
     'modules' => array(
         'ZFTool',
         'ZF\Apigility\Admin',
+        'ZF\Configuration',
     ),
     // development time configuration globbing
     'module_listener_options' => array(