Merge branch '4.3.x-stable'

acogoluegnes · acogoluegnes · commit 72099bf48392 · 2017-10-16T11:16:25.000+02:00
Conflicts:
	release-versions.txt
diff --git a/release-versions.txt b/release-versions.txt
@@ -1,2 +1,2 @@
-RELEASE_VERSION="5.0.0"
+RELEASE_VERSION="5.0.1.RC1"
 DEVELOPMENT_VERSION="5.0.1-SNAPSHOT"

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