mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-07-25 17:42:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
5924e443fbf50e38c1dc26803c5aa1e4ef0bd52d
cryptomator/src/main
T
History
Sebastian Stenzel 5924e443fb Merge branch 'develop' into feature/hub 
# Conflicts:
#	.idea/runConfigurations/Cryptomator_Linux.xml
#	.idea/runConfigurations/Cryptomator_Linux_Dev.xml
#	.idea/runConfigurations/Cryptomator_Windows.xml
#	.idea/runConfigurations/Cryptomator_Windows_Dev.xml
#	.idea/runConfigurations/Cryptomator_macOS.xml
#	.idea/runConfigurations/Cryptomator_macOS_Dev.xml
#	pom.xml
2021-11-02 15:53:23 +01:00
..
java
Merge branch 'develop' into feature/hub
2021-11-02 15:53:23 +01:00
resources
Merge branch 'develop' into feature/hub
2021-11-02 15:53:23 +01:00