projects
/
zf2.biz
/
galerie.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into feature/composer
[zf2.biz/galerie.git]
/
config
/
application.config.php
diff --git
a/config/application.config.php
b/config/application.config.php
index
4c27d23
..
6e62784
100644
(file)
--- a/
config/application.config.php
+++ b/
config/application.config.php
@@
-4,6
+4,9
@@
return array(
'Application',
),
'module_listener_options' => array(
'Application',
),
'module_listener_options' => array(
+ 'config_glob_paths' => array(
+ 'config/autoload/{,*.}{global,local}.php',
+ ),
'config_cache_enabled' => false,
'cache_dir' => 'data/cache',
'module_paths' => array(
'config_cache_enabled' => false,
'cache_dir' => 'data/cache',
'module_paths' => array(
@@
-13,7
+16,7
@@
return array(
),
'service_manager' => array(
'use_defaults' => true,
),
'service_manager' => array(
'use_defaults' => true,
- 'factories' => array(
- )
- )
+ 'factories' => array(
+ ),
+ ),
);
);