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
..
codeStyleConfig.xml	Merge remote-tracking branch 'upstream/master'	2018-09-25 19:58:15 -05:00
Project.xml	Update code style	2018-09-19 09:06:35 +02:00