Christoph Atteneder 3bb503d289 Merge branch 'master' of github.com:bisq-network/bisq-desktop into redesign ... # Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.		2018-09-24 11:34:05 +02:00
..
gradle	Move witness gradle plugin to desktop	2018-09-05 10:27:23 +02:00
package	Add LSAppNapIsDisabled and NSSupportsAutomaticGraphicsSwitching	2018-09-21 12:45:46 -05:00
src	Merge branch 'master' of github.com:bisq-network/bisq-desktop into redesign	2018-09-24 11:34:05 +02:00
build.gradle	Prepare for Java 10 and clean up rebase issues	2018-09-19 19:19:15 +02:00
settings.gradle	Add assets to settings file	2018-09-05 11:09:58 +02:00