Mike Rosseel fed47a0342 Merge branch 'DAO' into protobuffer ... Conflicts: common/src/main/java/io/bitsquare/app/Log.java core/src/main/java/io/bitsquare/arbitration/ArbitratorManager.java core/src/main/java/io/bitsquare/btc/BitcoinModule.java core/src/main/java/io/bitsquare/btc/wallet/BsqWalletService.java core/src/main/java/io/bitsquare/btc/wallet/TradeWalletService.java core/src/main/java/io/bitsquare/btc/wallet/WalletService.java core/src/main/java/io/bitsquare/btc/wallet/WalletsSetup.java core/src/main/java/io/bitsquare/dao/DaoModule.java core/src/main/java/io/bitsquare/dao/vote/VotingManager.java gui/src/main/java/io/bitsquare/gui/main/account/content/backup/BackupView.java gui/src/main/java/io/bitsquare/gui/main/dao/DaoView.java gui/src/main/java/io/bitsquare/gui/main/dao/compensation/create/CreateCompensationRequestView.java gui/src/main/java/io/bitsquare/gui/main/dao/voting/vote/VoteView.java gui/src/main/java/io/bitsquare/gui/main/dao/wallet/send/BsqSendView.java gui/src/main/java/io/bitsquare/gui/main/disputes/arbitrator/ArbitratorDisputeView.java gui/src/main/java/io/bitsquare/gui/main/disputes/trader/TraderDisputeView.java gui/src/main/java/io/bitsquare/gui/main/market/spread/SpreadViewModel.java gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferDataModel.java gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferViewModel.java gui/src/main/java/io/bitsquare/gui/util/validation/AccountNrValidator.java network/pom.xml network/src/main/java/io/bitsquare/app/BitsquareEnvironment.java network/src/main/java/io/bitsquare/messages/alert/Alert.java network/src/main/java/io/bitsquare/messages/btc/provider/fee/FeeService.java network/src/main/java/io/bitsquare/messages/trade/offer/payload/Offer.java network/src/main/java/io/bitsquare/messages/user/Preferences.java network/src/main/java/io/bitsquare/p2p/network/Connection.java pom.xml statistics/src/main/java/io/bitsquare/statistics/Statistics.java		2017-03-07 16:40:57 +01:00
..
src	Merge branch 'DAO' into protobuffer	2017-03-07 16:40:57 +01:00
pom.xml	Merge branch 'DAO' into protobuffer	2017-03-07 16:40:57 +01:00