mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-17 18:21:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
28cb2e1301e27d5bc3dd950c16b16564c01769bf
cryptomator/main/ui
History
Sebastian Stenzel 28cb2e1301 Merge branch 'develop' into feature/cryptofs 
# Conflicts:
#	main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/impl/Scrypt.java
#	main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/jackrabbitservlet/DavFileWithRange.java
#	main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/jackrabbitservlet/FilesystemResourceFactory.java
#	main/frontend-webdav/src/test/java/org/cryptomator/frontend/webdav/WebDavServerTest.java
2017-02-24 16:51:42 +01:00
..
src
Merge branch 'develop' into feature/cryptofs
2017-02-24 16:51:42 +01:00
pom.xml
call me THE DESTROYER!!!
2016-12-16 17:20:56 +01:00