diff options
| author | John Molakvoæ <skjnldsv@users.noreply.github.com> | 2018-08-20 12:32:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-20 12:32:49 +0200 |
| commit | 1df733aa75c1096ee407433053a126510764db05 (patch) | |
| tree | 4c14598629f536074321e57393d06e5c0ee6f085 /.travis.yml | |
| parent | e097e80fc4454481fbc136f8a61e8017db74ed63 (diff) | |
| parent | 23abfedcfa82b9148016d7b93df7af52d6eb090a (diff) | |
Merge pull request #312 from nextcloud/14-bump-scroll-fixes
New layout fix, scrolling and keyboard shortcuts fixes
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index ec4b55968..513069964 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,6 @@ sudo: false dist: trusty language: php php: - - 5.6 - 7 - 7.1 - 7.2 @@ -10,22 +9,23 @@ php: env: global: - - CORE_BRANCH=stable13 + - CORE_BRANCH=master - MOZ_HEADLESS=1 matrix: - DB=pgsql matrix: allow_failures: - - env: DB=pgsql CORE_BRANCH=master - php: nightly include: - php: 7.1 env: DB=sqlite + - php: 7.2 + env: DB=sqlite - php: 7.1 env: DB=mysql - - php: 7.1 - env: DB=pgsql CORE_BRANCH=master + - php: 7.2 + env: DB=mysql fast_finish: true before_install: |