Merge branch 'master' into is_on_main_chain_public2

This commit is contained in:
Andrew Poelstra 2018-03-09 14:50:00 +00:00 committed by GitHub
commit 78fdf7133f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions

4
.gitignore vendored
View File

@ -1,2 +1,6 @@
target target
Cargo.lock Cargo.lock
#IntelliJ project files
.idea
*.iml