Merge branch '3.7' of https://github.com/JumpMind/symmetric-ds into 3.8

Conflicts: symmetric-core/src/main/resources/symmetric-default.properties
JumpMind · Jun 28, 2016 · 9a262a1 · 9a262a1
2 parents 35f2234 + 2559114
commit 9a262a1
Show file tree

Hide file tree

Showing 19 changed files with 783 additions and 17 deletions.
diff --git a/symmetric-assemble/asciidoc.gradle b/symmetric-assemble/asciidoc.gradle
@@ -86,6 +86,7 @@ task generateDocs(type: Copy) {
         from ("$buildDir/src/asciidoc/html5/tutorials") { include "tutorials.html" }
         filter(org.apache.tools.ant.filters.ReplaceTokens, tokens: [
             'appVersion': version,
+            'appMajorVersion': version.substring(0, version.lastIndexOf(".")),
             'buildTime': new java.text.SimpleDateFormat('yyyy-MM-dd HH:mm:ss').format(new java.util.Date()),
             'scmVersion' : scmVersion
         ])