mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-24 15:10:44 +01:00
Code Issues Projects Releases Packages Wiki Activity
bisq/gui/src
History
Manfred Karrer 7753586ea6
Merge branch 'FixWrongFeeCalculationForTaker' 
# Conflicts:
#	gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferViewModel.java
#	gui/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferDataModel.java
2018-01-10 20:56:04 +01:00
..
main Merge branch 'FixWrongFeeCalculationForTaker' 2018-01-10 20:56:04 +01:00
test Merge branch 'deeponion-master' into Development 2018-01-09 21:44:06 +01:00