Merge tag '5.12.0' into develop

CDRussell · CDRussell · commit 9e95e0106233 · 2018-10-18T14:45:29.000+01:00
no message
diff --git a/app/version/version.properties b/app/version/version.properties
@@ -14,4 +14,4 @@
 # limitations under the License.
 #
 
-VERSION=5.11.1
+VERSION=5.12.0

Original file line number	Diff line number	Diff line change
`@@ -14,4 +14,4 @@`
`14`	`14`	`# limitations under the License.`
`15`	`15`	`#`
`16`	`16`
`17`		`-VERSION=5.11.1`
	`17`	`+VERSION=5.12.0`