diff options
author | vlad <vlad@driver.xyz> | 2017-05-09 19:13:44 -0700 |
---|---|---|
committer | vlad <vlad@driver.xyz> | 2017-05-09 19:13:44 -0700 |
commit | 725f495a01adfb7885be65a47dd8003a60e4aea8 (patch) | |
tree | c375ddac89f920d2ac9ed2251044dbfec3c7a287 /.travis.yml | |
parent | 5e095ce075227ea5690a621b8b3187936cc0cf75 (diff) | |
parent | 5989f12ee90a0e7d8210fad7a750e392c68e40fc (diff) | |
download | sbt-settings-725f495a01adfb7885be65a47dd8003a60e4aea8.tar.gz sbt-settings-725f495a01adfb7885be65a47dd8003a60e4aea8.tar.bz2 sbt-settings-725f495a01adfb7885be65a47dd8003a60e4aea8.zip |
Merge remote-tracking branch 'origin/master'
# Conflicts:
# README.md
Diffstat (limited to '.travis.yml')
-rw-r--r-- | .travis.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 78ea1b5..623e5c2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ language: scala # - oraclejdk8 scala: - - 2.11.8 + - 2.11.11 cache: directories: |