Merge branch 'develop' into feature/ERP-41-mise-a-jour-malio-ui
# Conflicts: # config/reference.php
This commit is contained in:
16
.gitignore
vendored
16
.gitignore
vendored
@@ -30,6 +30,13 @@ frontend/.output/
|
||||
frontend/dist/
|
||||
###< frontend ###
|
||||
|
||||
###> playwright ###
|
||||
frontend/test-results/
|
||||
frontend/playwright-report/
|
||||
frontend/blob-report/
|
||||
frontend/playwright/.cache/
|
||||
###< playwright ###
|
||||
|
||||
###> docker ###
|
||||
infra/dev/.env.docker.local
|
||||
###< docker ###
|
||||
@@ -37,3 +44,12 @@ infra/dev/.env.docker.local
|
||||
###> logs ###
|
||||
LOG/
|
||||
###< logs ###
|
||||
|
||||
###> friendsofphp/php-cs-fixer ###
|
||||
/.php-cs-fixer.php
|
||||
/.php-cs-fixer.cache
|
||||
###< friendsofphp/php-cs-fixer ###
|
||||
|
||||
###> symfony auto-generated ###
|
||||
/config/reference.php
|
||||
###< symfony auto-generated ###
|
||||
|
||||
Reference in New Issue
Block a user