Manfred Karrer 34b4c61792 Merge branch 'separateSecDeposit' into DAO ... # Conflicts: # gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferDataModel.java # gui/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferDataModel.java # gui/src/main/java/io/bisq/gui/main/overlays/windows/DisputeSummaryWindow.java # network-messages/src/main/java/io/bisq/network_messages/trade/offer/payload/OfferPayload.java # network/src/main/java/io/bisq/p2p/network/ProtoBufferUtilities.java # network/src/test/java/io/bisq/p2p/storage/P2PDataStorageTest.java		2017-03-16 12:28:59 -05:00
..
src	Merge branch 'separateSecDeposit' into DAO	2017-03-16 12:28:59 -05:00
pom.xml	Rebranding: replace bitsquare with bisq	2017-03-12 16:00:40 -05:00