Merge branch 'master' into dev

This commit is contained in:
2020-11-26 08:59:52 -06:00
76 changed files with 1578 additions and 196 deletions

View File

@@ -1,4 +1,4 @@
VERSION_CODE = 53
VERSION_CODE = 20000
VERSION_NAME = 2.0.0
MIN_SDK_VERSION = 21