Manfred Karrer f8ed97cb2e Merge branch 'Development' into 0.5.2 ... # Conflicts: # core/src/main/java/io/bisq/core/payment/payload/PaymentMethod.java		2017-07-15 14:57:42 +02:00
..
src	Merge branch 'Development' into 0.5.2	2017-07-15 14:57:42 +02:00
pom.xml	Change version nr back to 0.5.1 (0.5.2 is not ready yet)	2017-07-14 11:41:20 +02:00