diff options
author | Frankie <frankie.diamond@gmail.com> | 2017-01-12 04:17:17 +0800 |
---|---|---|
committer | Frankie <frankie.diamond@gmail.com> | 2017-01-12 04:17:17 +0800 |
commit | 0b59dafc344994838b3fbd146c55c73ce0cb76af (patch) | |
tree | 7b9dbdb7a1b79f0a5884da24d09b4398eff5e01b /.gitignore | |
parent | 0fae263a9acb1f4023070b37ee1b91815e34de86 (diff) | |
parent | 479da078979f0eaee05b2e25e1bb7113a5a62d6d (diff) | |
download | tangerine-wallet-browser-0b59dafc344994838b3fbd146c55c73ce0cb76af.tar tangerine-wallet-browser-0b59dafc344994838b3fbd146c55c73ce0cb76af.tar.gz tangerine-wallet-browser-0b59dafc344994838b3fbd146c55c73ce0cb76af.tar.bz2 tangerine-wallet-browser-0b59dafc344994838b3fbd146c55c73ce0cb76af.tar.lz tangerine-wallet-browser-0b59dafc344994838b3fbd146c55c73ce0cb76af.tar.xz tangerine-wallet-browser-0b59dafc344994838b3fbd146c55c73ce0cb76af.tar.zst tangerine-wallet-browser-0b59dafc344994838b3fbd146c55c73ce0cb76af.zip |
Merge branch 'dev' into integrateTxManagerUI
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index af6449834..c61847aab 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ test/bower_components package .DS_Store builds/ +disc/ notes.txt app/.DS_Store development/bundle.js |