Merge branch 'develop' of github.com:MetaMask/metamask-extension into network-remove-provider-engine

1 files changed, 15 insertions, 1 deletions

diff --git a/.eslintignore b/.eslintignore
index e4cade21c..44b38c3de 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,6 +1,20 @@
+node_modules/**
+dist/**
+builds/**
+docs/**
+
+development/bundle.js
+development/states.js
+
 app/scripts/lib/extension-instance.js
+app/scripts/chromereload.js
+
+ui/lib/blockies.js
+
+mascara/src/app/first-time/spinner.js
+mascara/test/jquery-3.1.0.min.js
+
 test/integration/bundle.js
 test/integration/jquery-3.1.0.min.js
 test/integration/helpers.js
 test/integration/lib/first-time.js
-ui/lib/blockies.js
\ No newline at end of file