Manfred Karrer 3689e4cbf1 Merge remote-tracking branch 'upstream/master' ... # Conflicts: # core/src/main/java/bisq/core/dao/state/SnapshotManager.java		2018-09-25 19:58:15 -05:00
..
codeStyleConfig.xml	Merge remote-tracking branch 'upstream/master'	2018-09-25 19:58:15 -05:00
Project.xml	Update imports for de.jensd.fx and optimize imports	2018-04-17 11:17:35 +02:00