Manfred Karrer 5b557ed37a Merge branch 'doa_with_translations' into DAO ... # Conflicts: # common/src/main/java/io/bitsquare/app/DevFlags.java # gui/src/main/java/io/bitsquare/gui/components/PeerInfoIcon.java # gui/src/main/java/io/bitsquare/gui/components/TxIdTextField.java # gui/src/main/java/io/bitsquare/gui/components/paymentmethods/CryptoCurrencyForm.java # gui/src/main/java/io/bitsquare/gui/components/paymentmethods/OKPayForm.java # gui/src/main/java/io/bitsquare/gui/components/paymentmethods/PaymentMethodForm.java # gui/src/main/java/io/bitsquare/gui/components/paymentmethods/PerfectMoneyForm.java # gui/src/main/java/io/bitsquare/gui/components/paymentmethods/SameBankForm.java # gui/src/main/java/io/bitsquare/gui/main/MainView.java # gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java # gui/src/main/java/io/bitsquare/gui/main/account/AccountView.java # gui/src/main/java/io/bitsquare/gui/main/account/arbitratorregistration/ArbitratorRegistrationView.java # gui/src/main/java/io/bitsquare/gui/main/account/content/altcoinaccounts/AltCoinAccountsView.java # gui/src/main/java/io/bitsquare/gui/main/account/content/altcoinaccounts/AltCoinAccountsViewModel.java # gui/src/main/java/io/bitsquare/gui/main/account/content/arbitratorselection/ArbitratorSelectionView.java # gui/src/main/java/io/bitsquare/gui/main/account/content/backup/BackupView.java # gui/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.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/wallet/send/BsqSendView.java # gui/src/main/java/io/bitsquare/gui/main/debug/DebugView.java # gui/src/main/java/io/bitsquare/gui/main/disputes/trader/TraderDisputeView.java # gui/src/main/java/io/bitsquare/gui/main/funds/deposit/DepositView.java # gui/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.java # gui/src/main/java/io/bitsquare/gui/main/market/offerbook/OfferBookChartView.java # gui/src/main/java/io/bitsquare/gui/main/market/spread/SpreadView.java # gui/src/main/java/io/bitsquare/gui/main/market/trades/TradesChartsView.java # gui/src/main/java/io/bitsquare/gui/main/offer/BuyOfferView.java # gui/src/main/java/io/bitsquare/gui/main/offer/OfferView.java # gui/src/main/java/io/bitsquare/gui/main/offer/SellOfferView.java # gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferDataModel.java # gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferView.java # gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferViewModel.java # gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookView.java # gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferDataModel.java # gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferViewModel.java # gui/src/main/java/io/bitsquare/gui/main/overlays/Overlay.java # gui/src/main/java/io/bitsquare/gui/main/overlays/editor/PeerInfoWithTagEditor.java # gui/src/main/java/io/bitsquare/gui/main/overlays/windows/ContractWindow.java # gui/src/main/java/io/bitsquare/gui/main/overlays/windows/DisputeSummaryWindow.java # gui/src/main/java/io/bitsquare/gui/main/overlays/windows/FilterWindow.java # gui/src/main/java/io/bitsquare/gui/main/overlays/windows/OfferDetailsWindow.java # gui/src/main/java/io/bitsquare/gui/main/overlays/windows/SendAlertMessageWindow.java # gui/src/main/java/io/bitsquare/gui/main/overlays/windows/SendPrivateNotificationWindow.java # gui/src/main/java/io/bitsquare/gui/main/overlays/windows/TacWindow.java # gui/src/main/java/io/bitsquare/gui/main/overlays/windows/TradeDetailsWindow.java # gui/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersView.java # gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesDataModel.java # gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java # gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java # gui/src/main/java/io/bitsquare/gui/util/BSFormatter.java # gui/src/main/java/io/bitsquare/gui/util/GUIUtil.java # gui/src/main/java/io/bitsquare/gui/util/validation/AccountNrValidator.java # gui/src/main/java/io/bitsquare/gui/util/validation/BankIdValidator.java # gui/src/main/java/io/bitsquare/gui/util/validation/BranchIdValidator.java # gui/src/main/java/io/bitsquare/gui/util/validation/BtcAddressValidator.java # gui/src/main/java/io/bitsquare/gui/util/validation/SecurityDepositValidator.java # network/src/main/java/io/bitsquare/messages/provider/price/PriceFeedService.java # network/src/main/java/io/bitsquare/messages/trade/offer/payload/Offer.java		2017-03-12 12:50:36 -05:00
..
src	Merge branch 'doa_with_translations' into DAO	2017-03-12 12:50:36 -05:00
pom.xml	moving app classes to make it start again.	2017-02-17 14:45:03 +01:00