Merge branch '2.0'

Conflicts:
	gradle.properties
This commit is contained in:
Mattias Hellborg Arthursson
2013-08-27 07:42:02 +02:00

View File

@@ -1 +1 @@
version=1.3.3.CI-SNAPSHOT
version=2.0.M1.CI-SNAPSHOT