diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-10-14 12:04:58 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-10-14 12:04:58 +0200 |
| commit | 57a2e63300dd37f7c746d5218273c00b8db4e983 (patch) | |
| tree | ee4c0ea8c3a4ef9de39908865e93a01946b55bf9 | |
| parent | fd0ddd6b765639a414d0dc97764f6fecf7fed012 (diff) | |
| parent | 3367f0036a2521c7d6ea2b3fed5d42f7b0d19611 (diff) | |
| download | forums-57a2e63300dd37f7c746d5218273c00b8db4e983.tar forums-57a2e63300dd37f7c746d5218273c00b8db4e983.tar.gz forums-57a2e63300dd37f7c746d5218273c00b8db4e983.tar.bz2 forums-57a2e63300dd37f7c746d5218273c00b8db4e983.tar.xz forums-57a2e63300dd37f7c746d5218273c00b8db4e983.zip | |
Merge branch '3.1.x'
Conflicts:
.travis.yml
| -rw-r--r-- | .travis.yml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 88b5610d20..4f9734a19a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,4 +48,3 @@ script: - sh -c "if [ '$NOTESTS' != '1' -a '$SLOWTESTS' != '1' ]; then phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml; fi" - sh -c "if [ '$SLOWTESTS' = '1' ]; then phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml --group slow; fi" - sh -c "set -x;if [ '$NOTESTS' = '1' -a '$TRAVIS_PULL_REQUEST' != 'false' ]; then git-tools/commit-msg-hook-range.sh origin/$TRAVIS_BRANCH..FETCH_HEAD; fi" - - php -i | grep opcache |