Merge branch '1.x.x-stable'

acogoluegnes · acogoluegnes · commit 61e47917e0a5 · 2017-10-27T14:31:00.000+02:00
Conflicts:
	pom.xml
	release-versions.txt
diff --git a/release-versions.txt b/release-versions.txt
@@ -1,2 +1,2 @@
 RELEASE_VERSION="2.0.0.RC1"
-DEVELOPMENT_VERSION="2.0.0-SNAPSHOT"
+DEVELOPMENT_VERSION="2.0.0-SNAPSHOT"

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