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
..
codeStyles	Merge branch 'master' of github.com:bisq-network/bisq-desktop into redesign	2018-10-16 10:09:37 +02:00
fileTemplates	Add common IDEA file templates (bisq-network/style#8)	2018-03-20 10:10:52 +01:00