Armin Schrenk 45f038bae2 Merge branch 'develop' into feature/hub ...

# Conflicts:
#	dist/mac/dmg/build.sh
#	dist/win/build.ps1
#	pom.xml

2022-06-22 09:55:02 +02:00

..

appimage

Merge branch 'develop' into feature/hub

2022-04-25 15:30:56 +02:00

common

Prepare 1.6.10

2022-05-03 16:15:33 +02:00

debian

Merge branch 'develop' into feature/hub

2022-04-25 15:30:56 +02:00

resources

Release to PPA (#1791)

2021-09-16 13:01:34 +02:00

launcher-gtk2.properties

run Cryptomator binaries instead of java from AppImage launcher .sh

2022-03-18 17:25:04 +01:00

launcher.sh

restructured dist/ dir

2021-07-22 14:09:06 +02:00