Merge branch 'develop' into contextTypes

# Conflicts:
#	ui/app/components/send_/send-content/send-gas-row/gas-fee-display/gas-fee-display.component.js

1 files changed, 2 insertions, 1 deletions

diff --git a/.nsprc b/.nsprc
index cb37fad49..bd3a4f039 100644
--- a/.nsprc
+++ b/.nsprc
@@ -1,6 +1,7 @@
 {
   "exceptions": [
     "https://nodesecurity.io/advisories/566",
-    "https://nodesecurity.io/advisories/157"
+    "https://nodesecurity.io/advisories/157",
+    "https://nodesecurity.io/advisories/577"
   ]
 }