3021: Merge branch 'master' into 3021-workbench-perf

[arvados.git] / apps / workbench / Gemfile.lock

diff --git a/apps/workbench/Gemfile.lock b/apps/workbench/Gemfile.lock
index c72f2564f1cee9d51e8bd0cd181be0d5e85e7281..d599fc2c1248255bc572419c7e4ab9ee553a1c21 100644 (file)
--- a/apps/workbench/Gemfile.lock
+++ b/apps/workbench/Gemfile.lock
@@ -40,7 +40,7 @@ GEM
     andand (1.3.3)
     angularjs-rails (1.3.8)
     arel (5.0.1.20140414130214)
-    arvados (0.1.20150111195521)
+    arvados (0.1.20150115165920)
       activesupport (>= 3.2.13)
       andand (~> 1.3, >= 1.3.3)
       google-api-client (~> 0.6.3, >= 0.6.3)
@@ -258,7 +258,7 @@ DEPENDENCIES
   RedCloth
   andand
   angularjs-rails
-  arvados (>= 0.1.20150111195521)
+  arvados (>= 0.1.20150115165920)
   bootstrap-sass (~> 3.1.0)
   bootstrap-tab-history-rails
   bootstrap-x-editable-rails