apps-android-commons/app/src
Sean Mac Gillicuddy d5b62befc9 Merge remote-tracking branch 'origin/master' into structured-data
# Conflicts:
#	app/src/main/java/fr/free/nrw/commons/upload/UploadService.java
#	app/src/main/java/fr/free/nrw/commons/wikidata/WikidataEditService.java
2020-03-24 13:35:49 +00:00
..
androidTest/java/fr/free/nrw/commons Merge remote-tracking branch 'origin/master' into structured-data 2020-03-20 08:46:39 +00: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 remote-tracking branch 'origin/master' into structured-data 2020-03-24 13:35:49 +00: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 remote-tracking branch 'origin/master' into structured-data 2020-03-24 13:35:49 +00:00