chimp1984 a0e690997a Merge branch 'master_upstream' into Fix-small-P2P-network-issues ... # Conflicts: # core/src/main/java/bisq/core/setup/CoreNetworkCapabilities.java		2019-08-28 19:49:18 +02:00
..
.tx	Merge core repository at 4597613	2018-09-05 10:48:22 +02:00
src	Merge branch 'master_upstream' into Fix-small-P2P-network-issues	2019-08-28 19:49:18 +02:00
update_translations.sh	Add Japanese translations	2019-07-29 11:33:25 +02:00