mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-26 12:23:58 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'master' into rx_upload_count

Browse source 
# Conflicts:
#	app/src/main/java/fr/free/nrw/commons/concurrency/ThreadPoolExecutorService.java
#	app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java
This commit is contained in:
Mikel 2017-07-28 14:47:37 +01:00
commit 2b30924242
37 changed files with 191 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/build.gradle
View file

@ -56,8 +56,8 @@ android {
defaultConfig {
applicationId 'fr.free.nrw.commons'
versionCode 73
versionName '2.4.2'
versionCode 74
versionName '2.5.0'
minSdkVersion project.minSdkVersion
targetSdkVersion project.targetSdkVersion
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"