Merge branch 'master' into 6.0

sebastianfeldmann · sebastianfeldmann · commit 1724f23d0819 · 2020-02-29T10:37:10.000+01:00
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"/>
diff --git a/composer.lock b/composer.lock
