Merge branch 'dev' into light-theme

# Conflicts:
#	res/layout/activity_create_closed_group.xml
This commit is contained in:
Anton Chekulaev
2020-09-02 13:33:16 +10:00
21 changed files with 259 additions and 192 deletions

View File

@@ -185,8 +185,8 @@ dependencies {
implementation "com.opencsv:opencsv:4.6"
}
def canonicalVersionCode = 75
def canonicalVersionName = "1.4.6"
def canonicalVersionCode = 81
def canonicalVersionName = "1.4.7"
def postFixSize = 10
def abiPostFix = ['armeabi-v7a' : 1,