Christoph Atteneder 89729c41c9 Merge branch 'master' of github.com:bisq-network/bisq into release/v1.6.3 ... # Conflicts: # scripts/install_java.sh		2021-05-07 10:33:45 +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.6.3	2021-05-07 10:33:45 +02:00
update_translations.sh	Update translations for v1.5.0 and adding Czech and Italian	2020-11-09 09:18:47 +01:00