Manfred Karrer 7753586ea6 Merge branch 'FixWrongFeeCalculationForTaker' ... # Conflicts: # gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferViewModel.java # gui/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferDataModel.java		2018-01-10 20:56:04 +01:00
..
src	Merge branch 'FixWrongFeeCalculationForTaker'	2018-01-10 20:56:04 +01:00
pom.xml	Prepare v0.6.3	2018-01-09 23:36:49 +01:00