diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2019-11-22 18:21:07 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-11-22 18:21:07 +0100 |
| commit | f7ac1d2629691712a14f018d0114211d0639d64a (patch) | |
| tree | 726f4c3ae617bf3e187e0e23f606843fbeb22f6d /travis | |
| parent | 896b31272b3687c0f869bf9fdc1b580e80d19514 (diff) | |
| parent | b8e86975a494b53e06160a962505cdfcf055a391 (diff) | |
| download | forums-f7ac1d2629691712a14f018d0114211d0639d64a.tar forums-f7ac1d2629691712a14f018d0114211d0639d64a.tar.gz forums-f7ac1d2629691712a14f018d0114211d0639d64a.tar.bz2 forums-f7ac1d2629691712a14f018d0114211d0639d64a.tar.xz forums-f7ac1d2629691712a14f018d0114211d0639d64a.zip | |
Merge branch '3.2.x' into 3.3.x
Diffstat (limited to 'travis')
| -rwxr-xr-x | travis/setup-php-extensions.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/travis/setup-php-extensions.sh b/travis/setup-php-extensions.sh index 7d1400c3b3..67b87c0da7 100755 --- a/travis/setup-php-extensions.sh +++ b/travis/setup-php-extensions.sh @@ -58,6 +58,8 @@ then fi fi +# Disable xdebug on travis +phpenv config-rm xdebug.ini # redis # Disabled redis for now as it causes travis to fail |