Merge remote-tracking branch 'origin/master'

# Conflicts: # common.gradle
gaelyk · May 15, 2015 · ddd8d20 · ddd8d20
2 parents e228ce0 + 3685350
commit ddd8d20
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/template-project/build.gradle b/template-project/build.gradle
@@ -24,7 +24,7 @@ repositories {
 }
 
 dependencies {
-    def gaeVersion = '1.9.4'
+    def gaeVersion = '1.9.20'
     def groovyVersion = '2.3.0'
 
     compile "org.codehaus.groovy:groovy-all:${groovyVersion}"

diff --git a/website/war/WEB-INF/pages/download.gtpl b/website/war/WEB-INF/pages/download.gtpl
@@ -25,7 +25,7 @@ You can use the <b>Gaelyk</b> JAR in combination with Groovy 2.3.x and beyond an
 
 <p>
 The latest version was tested with Groovy 2.3.0,
-and with the 1.9.4 version of the App Engine SDK.
+and with the 1.9.20 version of the App Engine SDK.
 </p>
 
 <p>