Sean Mac Gillicuddy 25226f9e79 Merge remote-tracking branch 'origin/master' into macgills/3832-unused-declarations ... # Conflicts: # app/src/main/java/fr/free/nrw/commons/explore/SearchActivity.java # app/src/main/java/fr/free/nrw/commons/explore/depictions/child/PageableChildDepictionsDataSource.kt # app/src/main/java/fr/free/nrw/commons/explore/depictions/media/DepictedImagesFragment.kt # app/src/main/java/fr/free/nrw/commons/explore/depictions/parent/PageableParentDepictionsDataSource.kt # app/src/main/java/fr/free/nrw/commons/explore/paging/FooterAdapter.kt # app/src/main/java/fr/free/nrw/commons/media/MediaInterface.java # app/src/main/java/fr/free/nrw/commons/mwapi/OkHttpJsonApiClient.java # app/src/test/kotlin/ModelFunctions.kt # app/src/test/kotlin/fr/free/nrw/commons/explore/categroies/PageableSearchCategoriesDataSourceTest.kt # app/src/test/kotlin/fr/free/nrw/commons/explore/depictions/child/PageableChildDepictionsDataSourceTest.kt # app/src/test/kotlin/fr/free/nrw/commons/explore/depictions/parent/PageableParentDepictionsDataSourceTest.kt		2020-06-25 13:54:17 +01:00
..
src	Merge remote-tracking branch 'origin/master' into macgills/3832-unused-declarations	2020-06-25 13:54:17 +01:00
build.gradle	#3816 Update Android Gradle Plugin to 4.0.0 (#3817)	2020-06-17 09:37:43 -07: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