mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-28 15:40:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
141ffcf656e2ebf83bc8898dff10e9bc1a01433f
cryptomator/main/pom.xml
Sebastian Stenzel 902b29ee0a Merge branch 'develop' into feature/external-keychain 
# Conflicts:
#	main/pom.xml
#	main/ui/src/main/java/org/cryptomator/ui/CryptomatorModule.java
2016-08-30 19:22:45 +02:00

10 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink