Merge branch 'master-v5' into issue/17078
Showing
- .gitignore 4 additions, 2 deletions.gitignore
- composer.local.0.finc.json 14 additions, 4 deletionscomposer.local.0.finc.json
- config/application.config.php 3 additions, 12 deletionsconfig/application.config.php
- devops/composer/modules.php 44 additions, 0 deletionsdevops/composer/modules.php
- devops/docker/autoconfig/entrypoint.sh 33 additions, 0 deletionsdevops/docker/autoconfig/entrypoint.sh
- devops/docker/composer/Dockerfile 22 additions, 3 deletionsdevops/docker/composer/Dockerfile
- devops/docker/composer/entrypoint.sh 29 additions, 5 deletionsdevops/docker/composer/entrypoint.sh
- devops/docker/db/entrypoint.sh 23 additions, 0 deletionsdevops/docker/db/entrypoint.sh
- devops/docker/env/entrypoint.sh 37 additions, 0 deletionsdevops/docker/env/entrypoint.sh
- devops/docker/grunt/entrypoint.sh 45 additions, 0 deletionsdevops/docker/grunt/entrypoint.sh
- devops/docker/mail/entrypoint.sh 25 additions, 0 deletionsdevops/docker/mail/entrypoint.sh
- devops/docker/php/Dockerfile 28 additions, 0 deletionsdevops/docker/php/Dockerfile
- devops/docker/php/entrypoint.sh 25 additions, 0 deletionsdevops/docker/php/entrypoint.sh
- devops/docker/php/php.ini 28 additions, 0 deletionsdevops/docker/php/php.ini
- docker-compose.override.yml.dist 1 addition, 9 deletionsdocker-compose.override.yml.dist
- docker-compose.yml 60 additions, 64 deletionsdocker-compose.yml
- docker-env.0.finc.yml 48 additions, 0 deletionsdocker-env.0.finc.yml
- local/languages/de.ini 14 additions, 1 deletionlocal/languages/de.ini
- local/languages/en.ini 14 additions, 1 deletionlocal/languages/en.ini
- module/finc/config/module.config.php 66 additions, 42 deletionsmodule/finc/config/module.config.php
Please register or sign in to comment