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
..
java/io/bisq/gui	Merge branch 'Development' into 0.5.2	2017-07-15 14:57:42 +02:00
resources	download update is code complete	2017-07-07 17:37:47 +02:00