mirror/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-04-20 01:26:52 -04:00
Code Issues Packages Projects Releases Wiki Activity
Files
2bb87dfa969f1816d3e1eefdfb6bc7d62ed64da5
cryptomator/main
History
Sebastian Stenzel 2bb87dfa96 Merge branch 'release/1.2.0' into develop 
# Conflicts:
#	main/ant-kit/pom.xml
#	main/commons-test/pom.xml
#	main/commons/pom.xml
#	main/filesystem-api/pom.xml
#	main/filesystem-charsets/pom.xml
#	main/filesystem-crypto-integration-tests/pom.xml
#	main/filesystem-crypto/pom.xml
#	main/filesystem-inmemory/pom.xml
#	main/filesystem-invariants-tests/pom.xml
#	main/filesystem-nameshortening/pom.xml
#	main/filesystem-nio/pom.xml
#	main/filesystem-stats/pom.xml
#	main/frontend-api/pom.xml
#	main/frontend-webdav/pom.xml
#	main/jacoco-report/pom.xml
#	main/keychain/pom.xml
#	main/pom.xml
#	main/uber-jar/pom.xml
#	main/ui/pom.xml
2016-09-19 15:12:24 +02:00
..
ant-kit
increased version to 1.3.0-SNAPSHOT
2016-09-15 13:35:22 +02:00
commons
increased version to 1.3.0-SNAPSHOT
2016-09-15 13:35:22 +02:00
commons-test
increased version to 1.3.0-SNAPSHOT
2016-09-15 13:35:22 +02:00
filesystem-api
increased version to 1.3.0-SNAPSHOT
2016-09-15 13:35:22 +02:00
filesystem-charsets
increased version to 1.3.0-SNAPSHOT
2016-09-15 13:35:22 +02:00
filesystem-crypto
Merge branch 'release/1.2.0' into develop
2016-09-19 15:12:24 +02:00
filesystem-crypto-integration-tests
increased version to 1.3.0-SNAPSHOT
2016-09-15 13:35:22 +02:00
filesystem-inmemory
increased version to 1.3.0-SNAPSHOT
2016-09-15 13:35:22 +02:00
filesystem-invariants-tests
increased version to 1.3.0-SNAPSHOT
2016-09-15 13:35:22 +02:00
filesystem-nameshortening
increased version to 1.3.0-SNAPSHOT
2016-09-15 13:35:22 +02:00
filesystem-nio
increased version to 1.3.0-SNAPSHOT
2016-09-15 13:35:22 +02:00
filesystem-stats
increased version to 1.3.0-SNAPSHOT
2016-09-15 13:35:22 +02:00
frontend-api
increased version to 1.3.0-SNAPSHOT
2016-09-15 13:35:22 +02:00
frontend-webdav
increased version to 1.3.0-SNAPSHOT
2016-09-15 13:35:22 +02:00
jacoco-report
increased version to 1.3.0-SNAPSHOT
2016-09-15 13:35:22 +02:00
keychain
increased version to 1.3.0-SNAPSHOT
2016-09-15 13:35:22 +02:00
uber-jar
increased version to 1.3.0-SNAPSHOT
2016-09-15 13:35:22 +02:00
ui
Merge branch 'release/1.2.0' into develop
2016-09-19 15:12:24 +02:00
pom.xml
increased version to 1.3.0-SNAPSHOT
2016-09-15 13:35:22 +02:00