commit 8f14166f9d5b0601a14776b8fb03ca0c1822b61a
author Matthias Koller <m.koller@peak-solution.de> Thu Sep 14 15:06:38 2017 +0200
committer Matthias Koller <m.koller@peak-solution.de> Thu Sep 14 15:06:38 2017 +0200
tree d10d09abee63b3c4c9e110a8d974e10edd60e47a
parent 74b5d6ce159d394f25b5afcdc5db8bf05fd3c966
parent 3fde0cd45b040f1a58c0092058af151eb793639c

Merge branch 'dev'

Signed-off-by: Matthias Koller <m.koller@peak-solution.de>

gradle/wrapper/gradle-wrapper.properties

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index f1b7544..2bc62e8 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-bin.zip

gradlew

diff --git a/gradlew b/gradlew
old mode 100644
new mode 100755