Merge pull request #6 from evereveofficial/development

Merge Dev to Master
evereveofficial · Apr 5, 2017 · b37e4b9 · b37e4b9
2 parents cfe0f56 + 79eff05
commit b37e4b9
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/imports/plugins/custom/data_import b/imports/plugins/custom/data_import
diff --git a/imports/plugins/custom/ee-front-end b/imports/plugins/custom/ee-front-end
diff --git a/imports/plugins/custom/ee-pdp b/imports/plugins/custom/ee-pdp
diff --git a/imports/plugins/custom/ee-styles b/imports/plugins/custom/ee-styles
diff --git a/package.json b/package.json
@@ -34,7 +34,8 @@
     "country-data": "^0.0.31",
     "css-annotation": "^0.6.2",
     "deep-diff": "^0.3.4",
-    "dnd-core": "^2.3.0",
+    "dnd-core": "^2.2.3",
+    "elasticsearch": "^12.1.3",
     "faker": "^4.1.0",
     "fibers": "^1.0.15",
     "flatten-obj": "^3.1.0",