Merge branch 'develop' into feature/faf_doc_twig_blocks

This commit is contained in:
Eric Espie
2022-09-19 11:37:00 +02:00
4024 changed files with 282815 additions and 125403 deletions

4
.gitignore vendored
View File

@@ -45,9 +45,13 @@ test/vendor/*
!/log/index.php
!/log/web.config
# PHPUnit cache file
/test/.phpunit.result.cache
# Jetbrains
/.idea/**
!/.idea/IntelliLang.xml
# doc. generation
/.doc/vendor