Christoph Atteneder 98b03937d8 Merge branch 'master' of github.com:bisq-network/bisq into release/v1.3.8 ... # Conflicts: # core/src/main/java/bisq/core/support/dispute/agent/MultipleHolderNameDetection.java # core/src/main/java/bisq/core/trade/txproof/xmr/XmrTxProofService.java		2020-09-15 13:24:06 +02:00
..
.tx	Merge core repository at 4597613	2018-09-05 10:48:22 +02:00
src	Merge branch 'master' of github.com:bisq-network/bisq into release/v1.3.8	2020-09-15 13:24:06 +02:00
update_translations.sh	Remove Greek from supported core languages	2020-01-08 09:04:17 +01:00