mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-23 13:11:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
429ca6cfd0c01e962662bee281f1ff1afb193941
cryptomator/src/main
History
Sebastian Stenzel 429ca6cfd0 Merge branch 'develop' into feature/modular 
# Conflicts:
#	pom.xml
#	src/main/resources/license/THIRD-PARTY.txt
2021-06-26 17:48:13 +02:00
..
java
Merge branch 'develop' into feature/modular
2021-06-26 17:48:13 +02:00
resources
Merge branch 'develop' into feature/modular
2021-06-26 17:48:13 +02:00