Devin Bileck c2ca632eff Merge branch 'master' of https://github.com/bisq-network/bisq into rpm-package ... # Conflicts: # desktop/package/linux/package.sh # desktop/package/linux/release.sh		2019-01-07 16:57:40 -08:00
..
Dockerfile	Bump version number	2018-12-13 13:59:08 +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 https://github.com/bisq-network/bisq into rpm-package	2019-01-07 16:57:40 -08:00
release.sh	Generate RPM package	2019-01-04 00:59:48 -08:00