Manfred Karrer 1d0591084d Merge branch '0.6.7' ... # Conflicts: # common/pom.xml # common/src/main/java/io/bisq/common/app/Version.java # common/src/main/resources/i18n/displayStrings.properties # common/src/main/resources/i18n/displayStrings_hu.properties # common/src/main/resources/i18n/displayStrings_ro.properties # consensus/pom.xml # core/pom.xml # core/src/main/java/io/bisq/core/offer/OpenOfferManager.java # core/src/main/java/io/bisq/core/payment/PaymentAccountUtil.java # core/src/main/java/io/bisq/core/provider/fee/FeeService.java # gui/pom.xml # gui/src/main/java/io/bisq/gui/bisq.css # gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferDataModel.java # gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferView.java # gui/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferView.java # gui/src/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOffersView.java # gui/src/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOffersViewModel.java # gui/src/main/java/io/bisq/gui/util/GUIUtil.java # monitor/pom.xml # network/pom.xml # network/src/main/resources/PersistableNetworkPayloadMap_BTC_MAINNET # package/linux/32bitBuild.sh # package/linux/64bitBuild.sh # package/linux/Dockerfile # package/osx/create_app.sh # package/osx/finalize.sh # package/windows/32bitBuild.bat # package/windows/64bitBuild.bat # package/windows/Bisq.iss # pom.xml # seednode/pom.xml # statistics/pom.xml		2018-02-26 22:03:47 -05:00
..
src	Merge branch '0.6.7'	2018-02-26 22:03:47 -05:00
pom.xml	Set v0.6.7	2018-02-26 20:23:07 -05:00