Manfred Karrer ce5a8b4f19 Merge branch 'arbitration-system-improvements' of https://github.com/ManfredKarrer/bisq into ManfredKarrer-arbitration-system-improvements ... # Conflicts: # desktop/src/main/java/bisq/desktop/main/account/content/arbitratorselection/ArbitratorSelectionView.java		2018-10-16 11:48:11 -05: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 'arbitration-system-improvements' of https://github.com/ManfredKarrer/bisq into ManfredKarrer-arbitration-system-improvements	2018-10-16 11:48:11 -05:00
build.gradle	Update libdohj to d4ace7bc	2018-09-25 00:43:19 -05:00
settings.gradle	Add assets to settings file	2018-09-05 11:09:58 +02:00