mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-26 07:41:41 +01:00
Code Issues Projects Releases Packages Wiki Activity
bisq/desktop/src
History
Christoph Atteneder 45060575bd
Merge branch 'master' of github.com:bisq-network/bisq into redesign 
# Conflicts:
#	desktop/src/main/java/bisq/desktop/main/dao/governance/ProposalDisplay.java
#	desktop/src/main/java/bisq/desktop/main/dao/wallet/send/BsqSendView.java
#	desktop/src/main/java/bisq/desktop/main/settings/preferences/PreferencesView.java
2018-10-24 13:52:49 +02:00
..
main Merge branch 'master' of github.com:bisq-network/bisq into redesign 2018-10-24 13:52:49 +02:00
test Merge branch 'master' of github.com:bisq-network/bisq into redesign 2018-10-24 13:52:49 +02:00