diff options
| author | Zack Hobson | 2015-06-03 10:10:28 -0700 |
|---|---|---|
| committer | Zack Hobson | 2015-06-03 10:10:28 -0700 |
| commit | d0c69f5c7792591e3d1ad15bc3701e2edf4a489d (patch) | |
| tree | 1e84e7207c0e787ccb1db80c2a59c29bfc92c7ab | |
| parent | f011292a098e1cb3d20b29859a60403567805696 (diff) | |
| parent | f438586f19cd3bc4eb3bbd4d8b44694f85f3b2c2 (diff) | |
| download | hcl-d0c69f5c7792591e3d1ad15bc3701e2edf4a489d.tar.bz2 | |
Merge branch 'master' into upgrade-deps
| -rw-r--r-- | .travis.yml | 5 | ||||
| -rw-r--r-- | Gemfile.lock | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index c5363d5..86dd4bc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,6 @@ language: ruby rvm: - - 1.9.3 - 2.0.0 - - rbx-2.1.1 + - 2.1.6 + - 2.2.2 + - rbx-2.5.3 diff --git a/Gemfile.lock b/Gemfile.lock index cd51330..3af24e0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -90,3 +90,6 @@ DEPENDENCIES simplecov yajl-ruby yard + +BUNDLED WITH + 1.10.2 |