Merge branch '1.1.x'

wilkinsona · wilkinsona · commit 4a177de1f645 · 2017-03-08T12:21:30.000Z
diff --git a/gradle.properties b/gradle.properties
@@ -1,2 +1,3 @@
 version=1.2.0.BUILD-SNAPSHOT
+org.gradle.daemon=false
 org.gradle.jvmargs=-XX:MaxPermSize=512M

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`version=1.2.0.BUILD-SNAPSHOT`
	`2`	`+org.gradle.daemon=false`
`2`	`3`	`org.gradle.jvmargs=-XX:MaxPermSize=512M`