Manfred Karrer 18a3f1e5fe Merge branch 'master' into add-check-for-bsq-balance ... # Conflicts: # core/src/main/resources/i18n/displayStrings.properties		2019-03-28 19:53:23 -05:00
..
i18n	Merge branch 'master' into add-check-for-bsq-balance	2019-03-28 19:53:23 -05:00
wallet
bisq.policy	Remove myAddress from docs and scripts as it is not used/needed anymore	2019-03-08 10:58:53 -05:00
bisq.properties
btc_dao_betanet.seednodes	Set DAO_BETANET (Mainnet test) genesis tx	2019-03-16 18:32:31 -05:00
btc_dao_regtest.seednodes	Fix incorrect seed address	2019-03-26 21:34:26 -05:00
btc_mainnet.seednodes	Revert "Revert 2473067b090603dec983fa18995453bdd6d8de94"	2019-03-07 17:08:49 +01:00
btc_regtest.seednodes	Update comments	2019-03-07 11:29:56 -05:00
btc_testnet.seednodes	Add testnet seeds	2019-03-23 18:15:42 -05:00
prevent-app-nap-silent-sound.aiff