Christoph Atteneder 45060575bd Merge branch 'master' of github.com:bisq-network/bisq into redesign ... # Conflicts: # desktop/src/main/java/bisq/desktop/main/dao/governance/ProposalDisplay.java # desktop/src/main/java/bisq/desktop/main/dao/wallet/send/BsqSendView.java # desktop/src/main/java/bisq/desktop/main/settings/preferences/PreferencesView.java		2018-10-24 13:52:49 +02: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 'master' of github.com:bisq-network/bisq into redesign	2018-10-24 13:52:49 +02: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