diff options
author | Dan Finlay <dan@danfinlay.com> | 2016-12-20 05:35:43 +0800 |
---|---|---|
committer | Dan Finlay <dan@danfinlay.com> | 2016-12-20 05:37:27 +0800 |
commit | 77d2deb17654b87dfd306b7f7cef335b1b511a8f (patch) | |
tree | 7476af4926a4e27999086ee570e46c4f74621b84 /.gitignore | |
parent | 1b6ee56cac34cd3544fd375cad342eb8240ae8aa (diff) | |
parent | 6ce0bc4b11ccb7ffae4f58980db0301dc418c9c0 (diff) | |
download | tangerine-wallet-browser-77d2deb17654b87dfd306b7f7cef335b1b511a8f.tar.gz tangerine-wallet-browser-77d2deb17654b87dfd306b7f7cef335b1b511a8f.tar.zst tangerine-wallet-browser-77d2deb17654b87dfd306b7f7cef335b1b511a8f.zip |
Merged master into dev
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 3 |
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 |