mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-22 14:42:37 +01:00
Code Issues Projects Releases Packages Wiki Activity
bisq/core
History
Manfred Karrer ce5a8b4f19
Merge branch 'arbitration-system-improvements' of https://github.com/ManfredKarrer/bisq into ManfredKarrer-arbitration-system-improvements 
# Conflicts:
#	desktop/src/main/java/bisq/desktop/main/account/content/arbitratorselection/ArbitratorSelectionView.java
2018-10-16 11:48:11 -05:00
..
.tx Merge core repository at 4597613 2018-09-05 10:48:22 +02:00
src Merge branch 'arbitration-system-improvements' of https://github.com/ManfredKarrer/bisq into ManfredKarrer-arbitration-system-improvements 2018-10-16 11:48:11 -05:00
build.gradle Change btcd-cli4j to 3864e1c4 2018-10-01 12:17:40 -05:00
update_translations.sh Merge core repository at 4597613 2018-09-05 10:48:22 +02:00