From 9a1e6d454979c588dec30e97fd5b5c48bf42ebb9 Mon Sep 17 00:00:00 2001
From: James Brooks <james@bluebaytravel.co.uk>
Date: Thu, 18 Jun 2015 17:19:27 +0100
Subject: [PATCH] Use bootstrap-sass 3.3.5

---
 bower.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bower.json b/bower.json
index b6605494..349a8832 100644
--- a/bower.json
+++ b/bower.json
@@ -2,7 +2,7 @@
     "name": "Cachet",
     "dependencies": {
         "autosize": "~2.0.0",
-        "bootstrap-sass": "~3.3.4",
+        "bootstrap-sass": "~3.3.5",
         "humane-js": "~3.2.2",
         "ionicons": "~2.0.0",
         "jquery": "~2.1.1",
@@ -16,5 +16,8 @@
         "livestampjs": "~1.1.2",
         "chartjs": "~1.0.1",
         "eonasdan-bootstrap-datetimepicker": "~3.1.3"
+    },
+    "resolutions": {
+        "jquery": "~2.1.1"
     }
 }