From: Coleman Watts <coleman@civicrm.org>
Date: Fri, 30 Jan 2015 16:59:29 +0000 (-0500)
Subject: CRM-15890 - Add lo-dash to bower_components
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=1891a856382cdff7f8a78a18d88153e87ca25d45;p=civicrm-core.git

CRM-15890 - Add lo-dash to bower_components
---

diff --git a/CRM/Core/Resources.php b/CRM/Core/Resources.php
index 5064c0589b..d5b40a8897 100644
--- a/CRM/Core/Resources.php
+++ b/CRM/Core/Resources.php
@@ -675,7 +675,7 @@ class CRM_Core_Resources {
       "bower_components/jquery/dist/jquery.min.js",
       "bower_components/jquery-ui/jquery-ui.min.js",
       "bower_components/jquery-ui/themes/smoothness/jquery-ui$min.css",
-      "packages/backbone/lodash.compat$min.js",
+      "bower_components/lodash-compat/lodash.min.js",
       "packages/jquery/plugins/jquery.mousewheel$min.js",
       "packages/jquery/plugins/select2/select2$min.js",
       "packages/jquery/plugins/select2/select2.css",
diff --git a/bower.json b/bower.json
index 9c8a3f15cd..380c5a4b3d 100644
--- a/bower.json
+++ b/bower.json
@@ -16,7 +16,8 @@
     "qunit": "1.10.0",
     "d3": "3.4.11",
     "jquery": "1.11.2",
-    "jquery-ui": "1.11.2"
+    "jquery-ui": "1.11.2",
+    "lodash-compat": "~3.0.1"
   },
   "resolutions": {
     "angular": "~1.3.8"