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

Merge remote-tracking branch 'origin/master' into macgills/3756-depictions-pagination

Browse source 
# Conflicts:
#	app/src/main/java/fr/free/nrw/commons/category/CategoryClient.java
#	app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.java
#	app/src/main/java/fr/free/nrw/commons/upload/categories/UploadCategoriesFragment.java
#	app/src/main/res/values/strings.xml
#	gradle.properties
This commit is contained in:
Sean Mac Gillicuddy 2020-05-19 15:31:30 +01:00
commit 8d13122e0e
32 changed files with 651 additions and 907 deletions
Download patch file Download diff file Expand all files Collapse all files

1
gradle.properties
View file

@ -25,6 +25,7 @@ PREFERENCE_VERSION=1.1.0
CORE_KTX_VERSION=1.2.0
ADAPTER_DELEGATES_VERSION=4.3.0
PAGING_VERSION=2.1.2
MULTIDEX_VERSION=2.0.1
systemProp.http.proxyPort=0
systemProp.http.proxyHost=