Christoph Atteneder cdaba9d15d Merge branch 'master' of github.com:bisq-network/bisq into redesign ... # Conflicts: # desktop/build.gradle		2018-10-23 09:22:31 +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 redesign	2018-10-22 19:27:31 +02:00
build.gradle	Move javafx dependencies to common	2018-10-22 16:01:02 -05:00
update_translations.sh	Merge core repository at 4597613	2018-09-05 10:48:22 +02:00