apps-android-commons/app/src
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
..
androidTest/java/fr/free/nrw/commons Updated Navigation Base Activity Unit Tests (#2725) 2020-04-26 19:08:48 -07:00
beta/res/values Fix conflict between different product flavors (#1726) 2018-07-20 02:03:28 +10:00
betaDebug #2643: Remove unused resource files (#2641) 2019-03-18 22:47:29 +05:30
main Merge branch 'macgills/3760-categories-pagination' into macgills/3772-images-pagination 2020-05-28 13:26:52 +01:00
prod/res/values Fix conflict between different product flavors (#1726) 2018-07-20 02:03:28 +10:00
prodRelease/play/release-notes/en-US With release notes directory 2019-03-10 16:56:10 +05:30
test Merge branch 'macgills/3760-categories-pagination' into macgills/3772-images-pagination 2020-05-28 13:26:52 +01:00