aboutsummaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorkumavis <kumavis@users.noreply.github.com>2016-12-20 07:28:43 +0800
committerGitHub <noreply@github.com>2016-12-20 07:28:43 +0800
commitf7eec0b282de511d54fd50f2c75d7371ca6f399d (patch)
tree7476af4926a4e27999086ee570e46c4f74621b84 /.gitignore
parent1b6ee56cac34cd3544fd375cad342eb8240ae8aa (diff)
parent77d2deb17654b87dfd306b7f7cef335b1b511a8f (diff)
downloadtangerine-wallet-browser-f7eec0b282de511d54fd50f2c75d7371ca6f399d.tar
tangerine-wallet-browser-f7eec0b282de511d54fd50f2c75d7371ca6f399d.tar.gz
tangerine-wallet-browser-f7eec0b282de511d54fd50f2c75d7371ca6f399d.tar.bz2
tangerine-wallet-browser-f7eec0b282de511d54fd50f2c75d7371ca6f399d.tar.lz
tangerine-wallet-browser-f7eec0b282de511d54fd50f2c75d7371ca6f399d.tar.xz
tangerine-wallet-browser-f7eec0b282de511d54fd50f2c75d7371ca6f399d.tar.zst
tangerine-wallet-browser-f7eec0b282de511d54fd50f2c75d7371ca6f399d.zip
Merge pull request #936 from MetaMask/MergeMaster
Merge master
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore3
1 files changed, 2 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 5d901bac3..af6449834 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
dist
+npm-debug.log
node_modules
temp
.tmp
@@ -13,4 +14,4 @@ app/.DS_Store
development/bundle.js
builds.zip
test/integration/bundle.js
-npm-debug.log
+development/states.js