merging 1.7.1 release into develop branch
This commit is contained in:
@@ -1 +1,5 @@
|
||||
releaseVersion=1.8.0.DEVELOP
|
||||
<<<<<<< HEAD
|
||||
releaseVersion=1.8.0.DEVELOP
|
||||
=======
|
||||
releaseVersion=1.7.1.RELEASE
|
||||
>>>>>>> master
|
||||
|
||||
Reference in New Issue
Block a user