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
..
.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.2.4	2019-12-06 11:30:10 +01:00
update_translations.sh	Add Chinese Traditional file to update_translations.sh script	2019-12-03 12:01:02 +01:00