Manfred Karrer a8b833c285 Merge branch 'bonded-reputation' of https://github.com/sqrrm/bisq-desktop into sqrrm-bonded-reputation ... # Conflicts: # common/src/main/proto/pb.proto # core/src/main/java/bisq/core/app/misc/AppSetupWithP2PAndDAO.java # core/src/main/java/bisq/core/dao/DaoFacade.java # core/src/main/java/bisq/core/dao/governance/role/BondedRole.java # desktop/src/main/java/bisq/desktop/main/dao/bonding/lockup/LockupView.java		2018-10-31 13:17:57 -05:00
..
main	Merge branch 'bonded-reputation' of https://github.com/sqrrm/bisq-desktop into sqrrm-bonded-reputation	2018-10-31 13:17:57 -05:00
test/java/bisq/common	Merge common project at 6085d83	2018-09-05 10:39:56 +02:00