apps-android-commons/app
Sean Mac Gillicuddy 8d13122e0e Merge remote-tracking branch 'origin/master' into macgills/3756-depictions-pagination
# 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
2020-05-19 15:31:30 +01:00
..
src Merge remote-tracking branch 'origin/master' into macgills/3756-depictions-pagination 2020-05-19 15:31:30 +01:00
build.gradle Merge remote-tracking branch 'origin/master' into macgills/3756-depictions-pagination 2020-05-19 15:31:30 +01:00
proguard-rules.txt [WIP] Implemented Espresso tests for upload with multilingual descriptions (#2830) 2020-03-10 12:01:22 -07:00
quality.gradle Deprecation removed 2018-05-01 17:03:59 +05:30
test-proguard-rules.txt Update to API 28, and fix CI issues. (#2595) 2019-03-15 08:30:08 +05:30