Merge branch 'release/20160428'

thrillcall · Apr 28, 2016 · b4c7f72 · b4c7f72
2 parents 13747d6 + b2033d9
commit b4c7f72
Show file tree

Hide file tree

Showing 7 changed files with 189 additions and 3,823 deletions.
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-1.9.3-p448
+1.9.3-p551
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -8,12 +8,12 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    ZenTest (4.9.2)
+    ZenTest (4.11.0)
     albino (1.3.3)
       posix-spawn (>= 0.3.6)
     autotest (4.4.6)
       ZenTest (>= 4.4.1)
-    autotest-fsevent (0.2.8)
+    autotest-fsevent (0.2.10)
       sys-uname
     autotest-growl (0.2.16)
     awesome_print (1.0.2)
@@ -22,7 +22,7 @@ GEM
       i18n (~> 0.4)
     faraday (0.8.7)
       multipart-post (~> 1.1)
-    ffi (1.0.11)
+    ffi (1.9.10)
     i18n (0.6.0)
     multipart-post (1.2.0)
     nokogiri (1.4.7)
@@ -38,18 +38,18 @@ GEM
     rspec-expectations (2.7.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.7.0)
-    sys-uname (0.9.0)
+    sys-uname (1.0.2)
       ffi (>= 1.0.0)
     tzinfo (0.3.31)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  ZenTest (~> 4.9.2)
+  ZenTest (~> 4.11.0)
   albino (~> 1.3.3)
   autotest (~> 4.4.6)
-  autotest-fsevent (~> 0.2.8)
+  autotest-fsevent (~> 0.2.10)
   autotest-growl (~> 0.2.16)
   awesome_print (~> 1.0.1)
   bundler (>= 1.0.0)