diff options
author | Jonathan Boler <galatians@gmail.com> | 2018-06-04 12:59:43 -0500 |
---|---|---|
committer | Jonathan Boler <galatians@gmail.com> | 2018-06-04 12:59:43 -0500 |
commit | 3674ccd444275fd17cc453add398985a43acb056 (patch) | |
tree | 08fbd968c6f5a1bb1e18f7aef9555b73d5cdc682 /.travis.yml | |
parent | e7758b8b68e33ca770fcedec0ae66e636276be08 (diff) | |
parent | 187ace068bba7c63c46ee869ac6cc35716f1b7ab (diff) | |
download | rails-3674ccd444275fd17cc453add398985a43acb056.tar.gz rails-3674ccd444275fd17cc453add398985a43acb056.tar.bz2 rails-3674ccd444275fd17cc453add398985a43acb056.zip |
Merge branch 'master' of github.com:rails/rails
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 0fdea1367c..d7544fecb6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -91,7 +91,7 @@ matrix: env: - "GEM=ar:mysql2 MYSQL=mariadb" addons: - mariadb: 10.2 + mariadb: 10.3 - rvm: 2.5.1 env: - "GEM=ar:sqlite3_mem" |