Permalink
Browse files

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	common.gradle
  • Loading branch information...
musketyr committed May 15, 2015
2 parents e228ce0 + 3685350 commit ddd8d205034995d5e603e59e565a98d498c17195
Showing with 2 additions and 2 deletions.
  1. +1 −1 template-project/build.gradle
  2. +1 −1 website/war/WEB-INF/pages/download.gtpl
@@ -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}"
@@ -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>

0 comments on commit ddd8d20

Please sign in to comment.