Armin Schrenk d241f022ab Merge branch 'develop' into release/1.6.0 ...

# Conflicts:
#	pom.xml

2021-09-22 16:36:36 +02:00

..

background.bmp

Adjust windows installer build:

2021-08-03 14:03:36 +02:00

banner.bmp

Adjust windows installer build:

2021-08-03 14:03:36 +02:00

Cryptomator-Vault.ico

Win installer: use different icon file for Cryptomator files and make c9r/c9s file extensions non executing

2021-09-02 13:30:12 +02:00

Cryptomator.ico

restore accidentally removed file in 8764c81

2021-08-03 15:51:15 +02:00

customWizard.wxi

Adjust windows installer build:

2021-08-03 14:03:36 +02:00

FAvaultFile.properties

Win installer: use different icon file for Cryptomator files and make c9r/c9s file extensions non executing

2021-09-02 13:30:12 +02:00

license.rtf

updating third party license file

2021-08-16 15:27:06 +02:00

main.wxs

Block windows installation if old innosetup version is installed

2021-09-15 12:16:25 +02:00