Manfred Karrer 6861e76d61 Merge branch 'master' into release-candidate-0.9.0 ... # Conflicts: # desktop/src/main/java/bisq/desktop/util/GUIUtil.java # desktop/src/test/java/bisq/desktop/util/GUIUtilTest.java # gradle/witness/gradle-witness.gradle		2018-11-08 16:55:03 -05:00
..
codeStyleConfig.xml	Merge remote-tracking branch 'upstream/master'	2018-09-25 19:58:15 -05:00
Project.xml	Merge branch 'master' into release-candidate-0.9.0	2018-11-08 16:55:03 -05:00