Files
cryptomator/main
Sebastian Stenzel e65c84ca1d Merge tag '0.8.2'
Conflicts:
	main/core/pom.xml
	main/crypto-aes/pom.xml
	main/crypto-api/pom.xml
	main/installer-debian/pom.xml
	main/installer-osx/pom.xml
	main/installer-win-portable/pom.xml
	main/installer-win/pom.xml
	main/pom.xml
	main/uber-jar/pom.xml
	main/ui/pom.xml
2015-10-02 17:38:40 +02:00
..
2015-10-02 17:38:40 +02:00
2015-10-02 17:36:04 +02:00
2015-10-02 17:36:04 +02:00
2015-10-02 17:36:04 +02:00
2015-10-02 17:36:04 +02:00
2015-10-02 17:36:04 +02:00
2015-10-02 17:36:04 +02:00
2015-10-02 17:36:04 +02:00
2015-10-02 17:36:04 +02:00
2015-10-02 17:36:04 +02:00