Christoph Atteneder 0edbb1733c Merge branch 'master' of github.com:bisq-network/bisq-desktop into redesign ... # Conflicts: # desktop/src/main/java/bisq/desktop/main/settings/preferences/PreferencesView.java # desktop/src/main/java/bisq/desktop/util/FormBuilder.java		2018-10-16 10:09:37 +02:00
..
java	Merge branch 'master' of github.com:bisq-network/bisq-desktop into redesign	2018-10-16 10:09:37 +02:00
resources/downloadUpdate	Move desktop to subdirectory	2018-09-05 09:50:29 +02:00