Merge branch 'master' into release-candidate-0.9.0

This commit is contained in:
Manfred Karrer 2018-11-01 12:49:49 -05:00
commit bc82974996
No known key found for this signature in database
GPG Key ID: 401250966A6B2C46

View File

@ -814,7 +814,8 @@ you can open a support ticket manually by selecting the trade which causes the p
under \"Portfolio/Open trades\" and typing the key combination \"alt + o\" or \"option + o\". \
Please use that only if you are sure that the software is not working as expected. \
If you have problems or questions, please review the FAQ at the \
bisq.network web page or post in the Bisq forum at the support section.\n\n\
bisq.network web page or post in the Bisq forum at the support section.
support.initialInfo=Please note the basic rules for the dispute process:\n\
1. You need to respond to the arbitrators requests in between 2 days.\n\
2. The maximum period for the dispute is 14 days.\n\