Merge pull request #1730 from Bytom/prod

author Paladz <yzhu101@uottawa.ca>

Mon, 22 Apr 2019 06:23:42 +0000 (14:23 +0800)

committer GitHub <noreply@github.com>

Mon, 22 Apr 2019 06:23:42 +0000 (14:23 +0800)
author Paladz <yzhu101@uottawa.ca>
Mon, 22 Apr 2019 06:23:42 +0000 (14:23 +0800)
committer GitHub <noreply@github.com>
Mon, 22 Apr 2019 06:23:42 +0000 (14:23 +0800)
diff --cc account/accounts.go
Simple merge
diff --cc wallet/wallet.go
Simple merge
author	Paladz <yzhu101@uottawa.ca>
	Mon, 22 Apr 2019 06:23:42 +0000 (14:23 +0800)
committer	GitHub <noreply@github.com>
	Mon, 22 Apr 2019 06:23:42 +0000 (14:23 +0800)
		1	2
account/accounts.go	patch \|	diff1 \|	diff2 \|	blob \| history
wallet/wallet.go	patch \|	diff1 \|	diff2 \|	blob \| history