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
..
gradle	Move witness gradle plugin to desktop	2018-09-05 10:27:23 +02:00
package	Add custom background image, icon and positioning for dmg bundle	2018-09-28 12:05:06 +02:00
src	Merge branch 'bonded-reputation' of https://github.com/sqrrm/bisq-desktop into sqrrm-bonded-reputation	2018-10-31 13:17:57 -05:00
build.gradle	Merge branch 'master' of github.com:bisq-network/bisq into redesign	2018-10-24 13:52:49 +02:00
settings.gradle	Add assets to settings file	2018-09-05 11:09:58 +02:00