mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-19 19:21:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
f48963a6d0e3b346d0e5d4d01ec8ac2f00c91a7a
cryptomator/src/main/java
History
Sebastian Stenzel f48963a6d0 Merge branch 'develop' into feature/new-hub-keyloading 
# Conflicts:
#	src/main/java/org/cryptomator/ui/keyloading/hub/ReceiveKeyController.java
2023-08-09 15:26:03 +02:00
..
org/cryptomator
Merge branch 'develop' into feature/new-hub-keyloading
2023-08-09 15:26:03 +02:00
module-info.java
remove GSON from dependencies
2023-06-29 22:44:22 +02:00