apps-android-commons/app
Sean Mac Gillicuddy 350b19e62f Merge branch 'macgills/3760-categories-pagination' into macgills/3772-images-pagination
# Conflicts:
#	app/src/main/java/fr/free/nrw/commons/Media.java
#	app/src/main/java/fr/free/nrw/commons/media/MediaClient.java
#	app/src/main/java/fr/free/nrw/commons/media/MediaDetailInterface.java
#	app/src/main/java/fr/free/nrw/commons/media/MediaInterface.java
2020-05-28 13:26:52 +01:00
..
src Merge branch 'macgills/3760-categories-pagination' into macgills/3772-images-pagination 2020-05-28 13:26:52 +01:00
build.gradle #3760 remove duplicate dependency 2020-05-28 13:10:34 +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