Christoph Atteneder 44b4f429da Merge branch 'master' of github.com:bisq-network/bisq into release/v1.2.4 ... # Conflicts: # core/src/main/resources/i18n/displayStrings_zh-hant.properties		2019-12-06 11:30:10 +01:00
..
package	Merge branch 'master' of github.com:bisq-network/bisq into release/v1.2.4	2019-12-06 11:30:10 +01:00
src	Do not display confirmation icon for 0 BTC tx	2019-12-02 11:57:33 +01:00