From c994e38a7878f35a8287318a6cf532c83fd42031 Mon Sep 17 00:00:00 2001
From: Nicolas Le Goff <legoff.n@gmail.com>
Date: Thu, 13 Mar 2014 15:59:04 +0100
Subject: [PATCH] Update bower dependencies

---
 bower.json | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/bower.json b/bower.json
index 98c5af2178..38a72e7c10 100644
--- a/bower.json
+++ b/bower.json
@@ -2,31 +2,34 @@
   "name": "Phraseanet",
   "version": "3.8.3",
   "dependencies": {
-    "bootstrap": "~2.2.2",
+    "bootstrap": "2.3.2",
     "jquery": "~1.8.3",
     "jquery.ui": "~1.10.0",
     "font-awesome": "~3.0.2",
     "underscore": "~1.4.4",
     "modernizr": "~2.6.2",
-    "normalize-css" : "~2.1.0",
-    "json2" : "latest",
+    "normalize-css": "~2.1.0",
+    "json2": "latest",
     "humane-js": "~3.0.6",
     "qunit": "https://github.com/jquery/qunit.git#1.11.0",
     "jquery-file-upload": "~8.3.2",
     "blueimp-load-image": "latest",
-    "requirejs" : "~2.1",
+    "requirejs": "~2.1",
     "backbone-amd": "~1.0",
     "underscore-amd": "~1.4",
     "mocha": "~1.9",
-    "chai" : "~1.6",
+    "chai": "~1.6",
     "i18next": "~1.6",
     "sinon": "~1.7",
     "sinon-chai": "~2.4",
     "js-fixtures": "https://github.com/badunk/js-fixtures/archive/master.zip",
-    "bootstrap-multiselect": "https://github.com/davidstutz/bootstrap-multiselect.git#bootstrap-2-3",
-    "zxcvbn" : "https://github.com/lowe/zxcvbn.git",
-    "geonames-server-jquery-plugin" : "~0.2",
+    "bootstrap-multiselect": "v0.9",
+    "zxcvbn": "https://github.com/lowe/zxcvbn.git",
+    "geonames-server-jquery-plugin": "~0.2",
     "jquery-galleria": "1.2.9",
     "jquery.cookie": "~1.4"
+  },
+  "resolutions": {
+    "jquery": "~1.8.3"
   }
 }