mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-20 10:22:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into voting

Browse Source 
# Conflicts:
#	src/main/resources/i18n/displayStrings.properties

Merge branch 'master' into voting

# Conflicts:
#	build.gradle
This commit is contained in:
Manfred Karrer 2018-08-14 23:29:02 +02:00
parent f77eb4345f
commit 87305eb747
No known key found for this signature in database
GPG Key ID: 401250966A6B2C46
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/bisq/desktop/main/offer/OfferView.java
View File

@ -37,10 +37,8 @@ import bisq.core.locale.TradeCurrency;
import bisq.core.offer.Offer; import bisq.core.offer.Offer;
import bisq.core.offer.OfferPayload; import bisq.core.offer.OfferPayload;
import bisq.core.user.Preferences; import bisq.core.user.Preferences;
import bisq.core.user.User;
import bisq.common.UserThread; import bisq.common.UserThread;
import bisq.common.handlers.ResultHandler;
import javafx.scene.control.Tab; import javafx.scene.control.Tab;
import javafx.scene.control.TabPane; import javafx.scene.control.TabPane;