Merge branch 'modular' into develop
Conflicts: .gitignore composer.json composer.lock config/.gitignore public/.htaccess public/css/style.css public/index.php
This diff is collapsed.
config/app.config.php
0 → 100644
config/dev.config.php.dist
0 → 100644
config/settings/.gitignore
0 → 100644
config/settings/global.php
0 → 100644
Please register or sign in to comment