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
..
codeStyles	Merge remote-tracking branch 'upstream/master'	2018-09-25 19:58:15 -05:00
fileTemplates	Add common IDEA file templates (bisq-network/style#8)	2018-03-20 10:10:52 +01:00