aboutsummaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2015-01-29 04:50:10 +0800
committerobscuren <geffobscura@gmail.com>2015-01-29 04:50:10 +0800
commitfd5d061d49ae32db3ebf8b8e6a14380742701661 (patch)
tree6b991781e4b5c7ebae726195f6b99b0edb807da0 /.gitignore
parent5e891ea981aabc1435c54decc1572788d3358954 (diff)
parent1337a8dfb11160d67db410b71af92a02d6b232f5 (diff)
downloadgo-tangerine-fd5d061d49ae32db3ebf8b8e6a14380742701661.tar
go-tangerine-fd5d061d49ae32db3ebf8b8e6a14380742701661.tar.gz
go-tangerine-fd5d061d49ae32db3ebf8b8e6a14380742701661.tar.bz2
go-tangerine-fd5d061d49ae32db3ebf8b8e6a14380742701661.tar.lz
go-tangerine-fd5d061d49ae32db3ebf8b8e6a14380742701661.tar.xz
go-tangerine-fd5d061d49ae32db3ebf8b8e6a14380742701661.tar.zst
go-tangerine-fd5d061d49ae32db3ebf8b8e6a14380742701661.zip
Merge branch 'develop' into Gustav-Simonsson-key_store_and_accounts_integration
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index f84fe6040..71ce90db3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,5 @@
.#*
*#
*~
+.project
+.settings