Manfred Karrer 59f31c7c6e Merge branch 'master' into fix-dao-full-mode-settings-issue ... # Conflicts: # common/src/main/proto/pb.proto # core/src/main/java/bisq/core/user/Preferences.java # core/src/main/java/bisq/core/user/PreferencesPayload.java # desktop/src/main/java/bisq/desktop/main/settings/preferences/PreferencesView.java		2019-04-19 20:32:11 -05:00
..
.tx	Merge core repository at 4597613	2018-09-05 10:48:22 +02:00
src	Merge branch 'master' into fix-dao-full-mode-settings-issue	2019-04-19 20:32:11 -05:00
update_translations.sh	Update transifex script with new core languages	2019-04-11 15:57:47 +02:00