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

---
 app/views/header.blade.php | 2 +-
 bower.json                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/header.blade.php b/app/views/header.blade.php
index 75460051c7aa..20a7b9ae72eb 100755
--- a/app/views/header.blade.php
+++ b/app/views/header.blade.php
@@ -12,7 +12,7 @@
 <script src="{{ asset('vendor/knockout.js/knockout.js') }}" type="text/javascript"></script>
 <script src="{{ asset('vendor/knockout-mapping/build/output/knockout.mapping-latest.js') }}" type="text/javascript"></script>
 <script src="{{ asset('vendor/knockout-sortable/build/knockout-sortable.min.js') }}" type="text/javascript"></script>
-<script src="{{ asset('vendor/underscore/underscore-min.js') }}" type="text/javascript"></script>		
+<script src="{{ asset('vendor/underscore/underscore.js') }}" type="text/javascript"></script>		
 <script src="{{ asset('vendor/bootstrap-datepicker/js/bootstrap-datepicker.js') }}" type="text/javascript"></script>		
 <script src="{{ asset('vendor/typeahead.js/dist/typeahead.min.js') }}" type="text/javascript"></script>	
 <script src="{{ asset('vendor/accounting/accounting.min.js') }}" type="text/javascript"></script>		
diff --git a/bower.json b/bower.json
index 098dc0043940..cad291b62526 100644
--- a/bower.json
+++ b/bower.json
@@ -19,6 +19,6 @@
     "pdfjs": "*"
   },
   "resolutions": {
-    "jquery": "~1.10.*"
+    "jquery": "~1.11.*"
   }
 }