Manfred Karrer dcadbdfc3e Merge branch 'master' into avoid-taker-fee-publishing-for-failed-trades ... # Conflicts: # core/src/main/java/bisq/core/offer/OfferPayload.java		2019-03-04 11:12:04 -05:00
..
java/bisq/core	Merge branch 'master' into avoid-taker-fee-publishing-for-failed-trades	2019-03-04 11:12:04 -05:00
resources	List Arqma (ARQ)	2019-03-04 15:20:14 +01:00