Merge branch '4.x.x-stable' into 5.1.x-stable

acogoluegnes · acogoluegnes · commit a47486e8cba3 · 2018-02-15T14:59:15.000+01:00
Conflicts:
	release-versions.txt
diff --git a/release-versions.txt b/release-versions.txt
@@ -1,2 +1,2 @@
-RELEASE_VERSION="5.1.2"
+RELEASE_VERSION="5.1.3.RC1"
 DEVELOPMENT_VERSION="5.1.3-SNAPSHOT"

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-RELEASE_VERSION="5.1.2"`
	`1`	`+RELEASE_VERSION="5.1.3.RC1"`
`2`	`2`	`DEVELOPMENT_VERSION="5.1.3-SNAPSHOT"`