Christoph Atteneder 11b0a466ce Merge branch 'master' of github.com:bisq-network/bisq into release/v1.5.0 ... # Conflicts: # core/src/main/java/bisq/core/provider/fee/FeeService.java # core/src/main/resources/i18n/displayStrings.properties # seednode/src/main/java/bisq/seednode/SeedNodeMain.java		2020-11-25 14:05:37 +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.5.0	2020-11-25 14:05:37 +01:00
update_translations.sh	Update translations for v1.5.0 and adding Czech and Italian	2020-11-09 09:18:47 +01:00