mirror/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-04-19 00:56:52 -04:00
Code Issues Packages Projects Releases Wiki Activity
Files
0.5.2
cryptomator/main
History
Sebastian Stenzel 1dd8a28a9d Merge remote-tracking branch 'origin/master' into 0.5.2 
Conflicts:
	main/core/pom.xml
	main/crypto-aes/pom.xml
	main/crypto-api/pom.xml
	main/pom.xml
	main/ui/pom.xml
2015-03-06 14:56:22 +01:00
..
core
Merge remote-tracking branch 'origin/master' into 0.5.2
2015-03-06 14:56:22 +01:00
crypto-aes
Merge remote-tracking branch 'origin/master' into 0.5.2
2015-03-06 14:56:22 +01:00
crypto-api
Merge remote-tracking branch 'origin/master' into 0.5.2
2015-03-06 14:56:22 +01:00
ui
Branch 0.5.2 for windows
2015-03-06 14:55:30 +01:00
pom.xml
Branch 0.5.2 for windows
2015-03-06 14:55:30 +01:00