From efe0d3ab22e1cef3148a98bc7c9d250ab083befd Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Fri, 4 Nov 2016 11:18:05 +1100
Subject: [PATCH] Update spree, upgrading jquery-rails to provide jquery 1.9.
 Fixes ng-tags-input.

---
 Gemfile.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 383caa2bab..119ebe48f9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -30,7 +30,7 @@ GIT
 
 GIT
   remote: git://github.com/openfoodfoundation/spree.git
-  revision: 4a0013618dbd5bae254e921565bf51d3dd5ccd24
+  revision: f799d0fd62760e59ac097143dcac0ea35a76f001
   branch: spree-upgrade-step-2
   specs:
     spree (1.3.99)
@@ -54,7 +54,7 @@ GIT
       deface (>= 0.9.0)
       ffaker (~> 1.15.0)
       highline (= 1.6.11)
-      jquery-rails (~> 2.1.4)
+      jquery-rails (~> 2.2.0)
       json (>= 1.5.5)
       kaminari (= 0.13.0)
       money (= 5.0.0)
@@ -426,7 +426,7 @@ GEM
     ipaddress (0.8.0)
     journey (1.0.4)
     jquery-migrate-rails (1.2.1)
-    jquery-rails (2.1.4)
+    jquery-rails (2.2.2)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.8.3)