Merge branch 'master' into 6.0

sebastianfeldmann · Feb 29, 2020 · 1724f23 · 1724f23
2 parents 5eb5ec9 + 8da97c6
commit 1724f23
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2,872 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,6 +7,7 @@
 .project
 .phpunit.result.cache
 .settings
+composer.lock
 /backup/*
 /build/coverage
 /build/logs

diff --git a/build.xml b/build.xml
@@ -577,6 +577,7 @@
 
     <exec executable="phpab">
       <arg value="--all"/>
+      <arg value="--tolerant"/>
       <arg value="--phar"/>
       <arg value="--gzip"/>
       <arg value="--output"/>