Merge branch 'master' into cronjobs

2016-01-21 13:39:43 +01:00 · 2016-01-21 13:39:43 +01:00 · 598ca6c2ca
commit 598ca6c2ca
parent 2d2e7aa528 1640c444de
2 changed files with 2 additions and 2 deletions
--- a/2
+++ b/2
@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 gemspec

-ruby '2.1.6' if ENV.key?('DYNO')
+ruby '2.1.7' if ENV.key?('DYNO')

 gem 's3',              github: 'travis-ci/s3'

--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -50,7 +50,7 @@ GIT

 GIT
  remote: git://github.com/travis-ci/travis-core.git
-  revision: 3a9f6e4c14bb1eacb93609e1864c9c547a13c1a4
+  revision: 96ee8c449ebe305c5c95633cea13eb88fe978abb
  specs:
    travis-core (0.0.1)
      actionmailer (~> 3.2.19)