Manfred Karrer 10a2b53e3a Merge branch 'master' into dao ... # Conflicts: # core/src/main/java/io/bisq/core/app/SetupUtils.java # core/src/main/java/io/bisq/core/btc/wallet/BsqWalletService.java # core/src/main/java/io/bisq/core/btc/wallet/WalletService.java # gui/src/main/java/io/bisq/gui/bisq.css # gui/src/main/java/io/bisq/gui/main/dao/compensation/create/CreateCompensationRequestView.java # gui/src/main/java/io/bisq/gui/main/offer/offerbook/OfferBookViewModel.java # gui/src/main/resources/logback.xml # network/src/main/java/io/bisq/network/p2p/peers/getdata/GetDataRequestHandler.java # network/src/main/java/io/bisq/network/p2p/peers/getdata/RequestDataHandler.java # network/src/main/java/io/bisq/network/p2p/storage/P2PDataStorage.java		2018-01-12 23:21:22 +01:00
..
java/io/bisq/seednode	Merge branch 'master' into dao	2018-01-12 23:21:22 +01:00
resources	Update license with Bisq instead of bisq	2017-06-27 01:39:11 +02:00