Manfred Karrer 7969374a4a Merge branch 'redesign' of https://github.com/ripcurlx/bisq-desktop into ripcurlx-redesign ... # Conflicts: # desktop/src/main/java/bisq/desktop/main/dao/governance/ProposalDisplay.java # desktop/src/main/java/bisq/desktop/main/dao/wallet/dashboard/BsqDashboardView.java		2018-10-25 19:59:00 -05:00
..
java/bisq/desktop	Merge branch 'redesign' of https://github.com/ripcurlx/bisq-desktop into ripcurlx-redesign	2018-10-25 19:59:00 -05:00
resources	Adapt header to new design	2018-10-18 11:46:21 +02:00