24 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
DenioD	d14e6d9c30	Merge branch 'dev' of https://github.com/DenioD/silentdragonlite-cli into dev	2019-10-24 23:23:41 +02:00
DenioD	39fd884ded	fix broken balance	2019-10-24 23:23:04 +02:00
DenioD	25ed8e2a62	fix	2019-10-24 01:25:46 +02:00
DenioD	61f016c871	fix prefix	2019-10-24 01:08:34 +02:00
DenioD	8ac15162cf	update librustzcash commit height	2019-10-24 00:52:27 +02:00
DenioD	ac0c282753	fix zs address	2019-10-23 23:58:12 +02:00
DenioD	da955de8b7	change address Prefix	2019-10-23 20:58:26 +02:00
DenioD	f6e87caf51	merged manually	2019-10-23 15:00:38 +02:00
DenioD	389fcb4360	merged manually	2019-10-23 14:56:33 +02:00
DenioD	0ca24a8623	mn	2019-10-22 23:58:03 +02:00
DenioD	59fc5a17c2	merged manually	2019-10-22 23:53:06 +02:00
DenioD	3fb483aa08	Merge updates manually	2019-10-22 23:47:29 +02:00
DenioD	1b4bfae1f6	merged updates,delete some trash	2019-10-22 18:35:11 +02:00
DenioD	72726bdc1a	Merge branch 'dev' of https://github.com/DenioD/silentdragonlite-cli into dev	2019-10-22 01:28:49 +02:00
DenioD	2aced7ebba	fix address test	2019-10-22 01:10:45 +02:00
DenioD	467ed0544e	merged upstream conflicts manually	2019-10-21 22:33:59 +02:00
DenioD	05ba67882c	merged conflicts manually	2019-10-21 22:32:32 +02:00
DenioD	813ba56b8e	Resolved merge conflict by incorporating both suggestions.	2019-10-21 13:33:00 +02:00
DenioD	2a4201dc52	Resolved merge conflict by incorporating both suggestions.	2019-10-21 13:31:06 +02:00
DenioD	1e3107fe55	manualy merged conflicts	2019-10-21 13:21:49 +02:00
DenioD	7a3285e08a	Resolved merge conflicts	2019-10-21 13:05:44 +02:00
DenioD	8c9523ad90	merged new updates	2019-10-20 23:12:03 +02:00
DenioD	457c3ea61e	renamed zatoshis to puposhis, update librustzcash commit high	2019-10-20 17:03:43 +02:00
DenioD	e7d272ce42	port to hush	2019-10-18 09:45:35 +02:00