Merge branch 'feature/kotlin' into dev

This commit is contained in:
2017-07-21 18:12:45 -04:00
parent 2db4c06fe8
commit 180c18f6bf
147 changed files with 3835 additions and 5594 deletions

View File

@@ -1,3 +1,3 @@
org.gradle.parallel=true
org.gradle.parallel=false
org.gradle.daemon=true
org.gradle.jvmargs=-Xms1024m -Xmx4096m -XX:MaxPermSize=2048m
org.gradle.jvmargs=-Xms2048m -Xmx2048m -XX:MaxPermSize=2048m