Merge branch '1.1.x'

This commit is contained in:
Andy Wilkinson
2017-03-08 12:21:30 +00:00

View File

@@ -1,2 +1,3 @@
version=1.2.0.BUILD-SNAPSHOT
org.gradle.daemon=false
org.gradle.jvmargs=-XX:MaxPermSize=512M