Christoph Atteneder 77c7629478 Merge branch 'master' of github.com:bisq-network/bisq into add-xmr-tx-key-service-3 ... # Conflicts: # desktop/src/main/java/bisq/desktop/main/MainView.java # desktop/src/main/java/bisq/desktop/main/MainViewModel.java		2020-09-03 17:10:05 +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 add-xmr-tx-key-service-3	2020-09-03 17:10:05 +02:00
update_translations.sh	Remove Greek from supported core languages	2020-01-08 09:04:17 +01:00