Merge branch '3.2.x' into 3.3.x

This commit is contained in:
Marc Alexander 2019-11-22 18:21:07 +01:00
commit f7ac1d2629
No known key found for this signature in database
GPG key ID: 50E0D2423696F995

View file

@ -58,6 +58,8 @@ then
fi fi
fi fi
# Disable xdebug on travis
phpenv config-rm xdebug.ini
# redis # redis
# Disabled redis for now as it causes travis to fail # Disabled redis for now as it causes travis to fail