Christoph Atteneder 77c7629478 Merge branch 'master' of github.com:bisq-network/bisq into add-xmr-tx-key-service-3 ... # Conflicts: # desktop/src/main/java/bisq/desktop/main/MainView.java # desktop/src/main/java/bisq/desktop/main/MainViewModel.java		2020-09-03 17:10:05 +02:00
..
package	Bump version number for v1.3.7	2020-07-30 10:19:34 +02:00
src	Merge branch 'master' of github.com:bisq-network/bisq into add-xmr-tx-key-service-3	2020-09-03 17:10:05 +02:00