Mike Rosseel b878389c25 Merge branch 'DAO' into disk-protobuffer ... Conflicts: bsq_utxo_provider/src/main/java/io/bisq/bsq_utxo_provider/BsqUtxoProviderModule.java common/src/main/java/io/bisq/common/storage/FileManager.java core/src/main/java/io/bisq/core/trade/statistics/TradeStatisticsManager.java gui/src/main/java/io/bisq/gui/app/BisqAppModule.java seednode/src/main/java/io/bisq/seednode/SeedNodeModule.java		2017-04-18 09:36:12 +02:00
..
src/main	Merge branch 'DAO' into disk-protobuffer	2017-04-18 09:36:12 +02:00
pom.xml	Update guice version. Add utxo_provider module.	2017-04-04 21:54:02 -05:00