Merge branch 'develop' of https://github.com/cryptomator/cryptomator into develop

Browse Source

# Conflicts:
#	main/ui/src/main/resources/i18n/strings.properties

...

This commit is contained in:

Sebastian Stenzel

2020-11-09 17:53:18 +01:00

parent e067b94aca b04d5669fb

commit 18f6e70bba

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available