Merge branch '2.0'
Conflicts: gradle.properties
This commit is contained in:
@@ -1 +1 @@
|
||||
version=1.3.3.CI-SNAPSHOT
|
||||
version=2.0.M1.CI-SNAPSHOT
|
||||
|
||||
Reference in New Issue
Block a user
Conflicts: gradle.properties
@@ -1 +1 @@
|
||||
version=1.3.3.CI-SNAPSHOT
|
||||
version=2.0.M1.CI-SNAPSHOT
|
||||
|
||||