Merge pull request #168 from privly/develop

Merge Develop into Master
privly · Jan 3, 2016 · 5c6c028 · 5c6c028
2 parents e915bd8 + 9ab6892
commit 5c6c028
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,7 @@ before_install:
 - git submodule update --init --recursive
 language: ruby
 rvm:
-- 2.2.3
+- 2.2.4
 env:
   global:
   - DB=mysql

diff --git a/Gemfile b/Gemfile
@@ -1,5 +1,5 @@
 source 'http://rubygems.org'
-ruby "2.2.3"
+ruby "2.2.4"
 
 # Core System
 gem 'rails', '~> 4.2.0'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -165,7 +165,7 @@ GEM
     net-http-persistent (2.9.4)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
-    net-ssh (3.0.1)
+    net-ssh (3.0.2)
     net-ssh-gateway (1.2.0)
       net-ssh (>= 2.6.5)
     netrc (0.11.0)