diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-07-20 12:02:02 +0200 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-07-20 12:02:02 +0200 |
commit | 0faeabefa7faedb3a6a3675a5e49e947554adae9 (patch) | |
tree | e51ae7db64408b159b2dfa13bfa9e01530223dc9 /.travis.yml | |
parent | 2bb138ef6df2d1a608b42907185b274fb87f4513 (diff) | |
parent | 317fc6e684356b645ea1327c2631c7d5fc193ddd (diff) | |
download | wallabag-0faeabefa7faedb3a6a3675a5e49e947554adae9.tar.gz wallabag-0faeabefa7faedb3a6a3675a5e49e947554adae9.tar.zst wallabag-0faeabefa7faedb3a6a3675a5e49e947554adae9.zip |
Merge remote-tracking branch 'origin/master' into 2.1
Diffstat (limited to '.travis.yml')
-rw-r--r-- | .travis.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index 17c3abaf..dd8815c1 100644 --- a/.travis.yml +++ b/.travis.yml | |||
@@ -23,6 +23,7 @@ php: | |||
23 | - 5.5 | 23 | - 5.5 |
24 | - 5.6 | 24 | - 5.6 |
25 | - 7.0 | 25 | - 7.0 |
26 | - nightly | ||
26 | - hhvm | 27 | - hhvm |
27 | 28 | ||
28 | node_js: | 29 | node_js: |