Merge branch 'feature/settings-moor' into dev

USDA-FSA · Feb 15, 2018 · 68cc20a · 68cc20a
2 parents b8e312b + eb5103c
commit 68cc20a
Show file tree

Hide file tree

Showing 4 changed files with 390 additions and 96 deletions.
diff --git a/package.json b/package.json
@@ -26,7 +26,7 @@
     "grunt-scss-lint": "^0.5.0",
     "grunt-simple-include": "^0.4.0",
     "load-grunt-tasks": "^3.5.2",
-    "node-sass": "^3.10.1",
+    "node-sass": "^4.7.2",
     "pixrem": "^3.0.2",
     "postcss": "^5.2.6",
     "time-grunt": "^1.4.0",