mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-09-20 15:04:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/external-keychain

Browse Source 
# Conflicts:
#	main/pom.xml
This commit is contained in:
Sebastian Stenzel
2016-08-31 19:45:15 +02:00
parent 141ffcf656 2e343a951f
commit 06e526a961
3 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main/pom.xml
+2 -2
View File
@@ -279,15 +279,15 @@
<module>filesystem-inmemory</module>
<module>filesystem-nio</module>
<module>filesystem-nameshortening</module>
<module>filesystem-charsets</module>
<module>filesystem-crypto</module>
<module>filesystem-crypto-integration-tests</module>
<module>filesystem-stats</module>
<module>filesystem-invariants-tests</module>
<module>frontend-api</module>
<module>frontend-webdav</module>
<module>ui</module>
<module>filesystem-charsets</module>
<module>keychain</module>
<module>ui</module>
</modules>
<profiles>