Merge 2.10 with master & Fixed merge conflicts (#2844)

This commit is contained in:
Ashish Kumar 2019-04-03 22:39:54 +05:30 committed by Josephine Lim
parent 02ad3b2dc8
commit 08a555c095
18 changed files with 172 additions and 113 deletions

View file

@ -104,8 +104,8 @@ android {
defaultConfig {
applicationId 'fr.free.nrw.commons'
versionCode 226
versionName '2.10.1'
versionCode 243
versionName '2.10.2'
setProperty("archivesBaseName", "app-commons-v$versionName-" + getBranchName())
minSdkVersion 19