cd2357 ca5f41a9d9 Merge remote-tracking branch 'bisq-network/hotfix/v1.6.1' into upgrade-javafax-14 ... # Conflicts: # build.gradle		2021-03-29 18:37:14 +02:00
..
.tx	Merge core repository at 4597613	2018-09-05 10:48:22 +02:00
src	Merge remote-tracking branch 'bisq-network/hotfix/v1.6.1' into upgrade-javafax-14	2021-03-29 18:37:14 +02:00
update_translations.sh	Update translations for v1.5.0 and adding Czech and Italian	2020-11-09 09:18:47 +01:00