mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-20 19:51:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
58b45bacd126bb7ea26749ba1e33edbdc9e636f2
cryptomator/main/commons
History
Sebastian Stenzel b3ff9423b4 Merge branch 'develop' into feature/vault-format-8 
# Conflicts:
#	main/commons/src/main/java/org/cryptomator/common/vaults/Vault.java
#	main/commons/src/main/java/org/cryptomator/common/vaults/VaultListManager.java
#	main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java
2021-04-21 11:20:31 +02:00
..
src
Merge branch 'develop' into feature/vault-format-8
2021-04-21 11:20:31 +02:00
pom.xml
Set dev branch back to SNAPSHOT version
2021-03-31 11:32:06 +02:00