From fc65576fd52a05ea51f5e68152f8d202c8b82ec3 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Wed, 9 Apr 2014 15:07:50 +0300
Subject: [PATCH] Resolving issues settng up the site

---
 .gitignore | 1 +
 bower.json | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 5bc74ae5bab7..cd5f809c0675 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@
 /public/logo
 /public/build
 /public/vendor
+/public/packages
 /bootstrap/compiled.php
 /bootstrap/environment.php
 /vendor
diff --git a/bower.json b/bower.json
index 04ef694a7165..098dc0043940 100644
--- a/bower.json
+++ b/bower.json
@@ -19,6 +19,6 @@
     "pdfjs": "*"
   },
   "resolutions": {
-    "jquery": "~1.*"
+    "jquery": "~1.10.*"
   }
 }