Christoph Atteneder 23432308a2 Merge branch 'master' of github.com:bisq-network/bisq into release/v1.3.4 ... # Conflicts: # build.gradle # desktop/package/linux/Dockerfile # desktop/package/linux/package.sh # desktop/package/linux/release.sh # desktop/package/macosx/create_app.sh # desktop/package/macosx/finalize.sh # desktop/package/macosx/insert_snapshot_version.sh # desktop/package/windows/package.bat # desktop/package/windows/release.bat # p2p/src/main/java/bisq/network/p2p/storage/P2PDataStorage.java # p2p/src/main/resources/AccountAgeWitnessStore_BTC_MAINNET # p2p/src/main/resources/DaoStateStore_BTC_MAINNET # p2p/src/main/resources/SignedWitnessStore_BTC_MAINNET # p2p/src/main/resources/TradeStatistics2Store_BTC_MAINNET # relay/src/main/resources/version.txt		2020-04-30 16:36:51 +02:00
..
src	Merge branch 'master' of github.com:bisq-network/bisq into release/v1.3.4	2020-04-30 16:36:51 +02:00