Christoph Atteneder 44b4f429da Merge branch 'master' of github.com:bisq-network/bisq into release/v1.2.4 ... # Conflicts: # core/src/main/resources/i18n/displayStrings_zh-hant.properties		2019-12-06 11:30:10 +01:00
..
Dockerfile	Revert to SNAPSHOT version	2019-12-05 12:23:57 +01:00
icon.png	Remove 32bit versions and update for Java 9+ support	2018-12-03 16:48:53 +01:00
LICENSE	Move desktop to subdirectory	2018-09-05 09:50:29 +02:00
package.sh	Merge branch 'master' of github.com:bisq-network/bisq into release/v1.2.4	2019-12-06 11:30:10 +01:00
release.sh	Revert to SNAPSHOT version	2019-12-05 12:23:57 +01:00