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
..
main/java/bisq/common	Merge branch 'master' of github.com:bisq-network/bisq into add-xmr-tx-key-service-3	2020-09-03 17:10:05 +02:00
test/java/bisq/common	Improve MovingAverage	2020-07-02 23:03:26 +02:00