From f5264491ca802561fcec00f066da8c4435f7aecc Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <23040076+greenkeeper[bot]@users.noreply.github.com>
Date: Tue, 29 Oct 2019 00:54:15 +0000
Subject: [PATCH] =?UTF-8?q?Update=20node-sass=20to=20the=20latest=20versio?=
 =?UTF-8?q?n=20=F0=9F=9A=80=20(#1355)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(package): update node-sass to version 4.13.0

* chore(package): update lockfile package-lock.json

* Revert "chore(package): update lockfile package-lock.json"

This reverts commit 3bf08486a1c80828ad2a3b5a45fd2f22909080a6.

* fix conflict
---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a8d89ebf4b..0cc30046a4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9595,9 +9595,9 @@
       }
     },
     "node-sass": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.12.0.tgz",
-      "integrity": "sha512-A1Iv4oN+Iel6EPv77/HddXErL2a+gZ4uBeZUy+a8O35CFYTXhgA8MgLCWBtwpGZdCvTvQ9d+bQxX/QC36GDPpQ==",
+      "version": "4.13.0",
+      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.13.0.tgz",
+      "integrity": "sha512-W1XBrvoJ1dy7VsvTAS5q1V45lREbTlZQqFbiHb3R3OTTCma0XBtuG6xZ6Z4506nR4lmHPTqVRwxT6KgtWC97CA==",
       "dev": true,
       "requires": {
         "async-foreach": "^0.1.3",
@@ -9607,7 +9607,7 @@
         "get-stdin": "^4.0.1",
         "glob": "^7.0.3",
         "in-publish": "^2.0.0",
-        "lodash": "^4.17.11",
+        "lodash": "^4.17.15",
         "meow": "^3.7.0",
         "mkdirp": "^0.5.1",
         "nan": "^2.13.2",
diff --git a/package.json b/package.json
index 01ff437b45..b8bbd783e1 100644
--- a/package.json
+++ b/package.json
@@ -90,7 +90,7 @@
     "http-server": "0.11.1",
     "jest": "24.8.0",
     "marked": "0.7.0",
-    "node-sass": "4.12.0",
+    "node-sass": "4.13.0",
     "null-loader": "^3.0.0",
     "parse-server": "github:parseplatform/parse-server#master",
     "path-to-regexp": "3.1.0",