Sebastian Stenzel 9890789c51 Merge branch 'master' into patches-1.0.x ...

# Conflicts:
#	main/commons-test/pom.xml
#	main/commons/pom.xml
#	main/filesystem-api/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/pom.xml
#	main/uber-jar/pom.xml
#	main/ui/pom.xml

2016-03-25 16:42:44 +01:00

..

commons

removed test dependencies from main project

2016-03-22 13:04:46 +01:00

commons-test

removed test dependencies from main project

2016-03-22 13:04:46 +01:00

filesystem-api

adjusted snapshot version [ci skip]

2016-03-21 16:49:58 +01:00

filesystem-crypto

Merge branch 'master' into patches-1.0.x

2016-03-25 16:42:44 +01:00

filesystem-crypto-integration-tests

adjusted snapshot version [ci skip]

2016-03-21 16:49:58 +01:00

filesystem-inmemory

adjusted snapshot version [ci skip]

2016-03-21 16:49:58 +01:00

filesystem-invariants-tests

adjusted snapshot version [ci skip]

2016-03-21 16:49:58 +01:00

filesystem-nameshortening

adjusted snapshot version [ci skip]

2016-03-21 16:49:58 +01:00

filesystem-nio

adjusted snapshot version [ci skip]

2016-03-21 16:49:58 +01:00

filesystem-stats

adjusted snapshot version [ci skip]

2016-03-21 16:49:58 +01:00

frontend-api

adjusted snapshot version [ci skip]

2016-03-21 16:49:58 +01:00

frontend-webdav

adjusted snapshot version [ci skip]

2016-03-21 16:49:58 +01:00

uber-jar

adjusted snapshot version [ci skip]

2016-03-21 16:49:58 +01:00

ui

Merge branch 'master' into patches-1.0.x

2016-03-25 16:42:44 +01:00

pom.xml

removed test dependencies from main project

2016-03-22 13:04:46 +01:00