Merge branch '1.0.0' into 456-unit-test-for-intransfer

LiskArchive · Oct 13, 2017 · bfd3450 · bfd3450
2 parents 1671cdd + 8130018
commit bfd3450
Show file tree

Hide file tree

Showing 12 changed files with 3,207 additions and 366 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,6 +15,8 @@ tmp
 sftp-config.json
 *.swp
 *.swo
+tmux-client-*.log
+Session.vim
 test/integration/logs/
 test/integration/configs/
 !test/integration/configs/config.non-forge.json