aboutsummaryrefslogtreecommitdiff
path: root/travis
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2019-11-22 18:21:12 +0100
committerMarc Alexander <admin@m-a-styles.de>2019-11-22 18:21:12 +0100
commit9b3010395d6e2954e68f4d79d636335a69369a8b (patch)
treeed28e4b1029c60a9400991445e0143bf84ce1971 /travis
parentMerge branch '3.3.x' (diff)
parentMerge branch '3.2.x' into 3.3.x (diff)
downloadphpbb-9b3010395d6e2954e68f4d79d636335a69369a8b.tar.gz
phpbb-9b3010395d6e2954e68f4d79d636335a69369a8b.tar.bz2
phpbb-9b3010395d6e2954e68f4d79d636335a69369a8b.zip
Merge branch '3.3.x'
Diffstat (limited to 'travis')
-rwxr-xr-xtravis/setup-php-extensions.sh2
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