Merge remote-tracking branch 'refs/remotes/origin/2.7.x-release'

# Conflicts:
#	app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java
This commit is contained in:
misaochan 2018-04-23 20:14:21 +10:00
commit d6a4188cb1
8 changed files with 80 additions and 23 deletions

View file

@ -82,8 +82,8 @@ android {
defaultConfig {
applicationId 'fr.free.nrw.commons'
versionCode 83
versionName '2.7.0'
versionCode 84
versionName '2.7.1'
setProperty("archivesBaseName", "app-commons-v$versionName-" + getBranchName())
minSdkVersion project.minSdkVersion