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
..
Bisq-setup-icon.bmp	Adapt to redesign	2018-12-10 15:24:02 +01:00
Bisq-setup-image.bmp	Update windows install experience	2018-12-22 14:37:25 -08:00
Bisq.ico	Adapt to redesign	2018-12-10 15:24:02 +01:00
Bisq.iss	Use lowercase 'bitcoin'	2019-11-27 22:36:53 -08:00
package.bat	Revert to SNAPSHOT version	2019-12-05 12:23:57 +01:00
release.bat	Revert to SNAPSHOT version	2019-12-05 12:23:57 +01:00