Merge remote-tracking branch 'server/bug3700' into bug3700

Conflicts:
	gradle/wrapper/gradle-wrapper.properties

Change-Id: If49f4e54be825229e897c30079fffc9d0a464faf
This commit is contained in:
Axel Uhl committed 2016-09-12 10:36:19 +02:00
commit 6244adfcbf
5 files changed
+17 -21

No files matched your search

Vendored Regular → Executable
+1 -1
View File
@@ -1,4 +1,4 @@
#Tue Aug 30 16:06:50 CEST 2016
#Mon Sep 12 09:37:26 CEST 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME