apps-android-commons/app/src
Sean Mac Gillicuddy 5d2c786392 Merge remote-tracking branch 'origin/master' into structured-data
# Conflicts:
#	app/src/main/java/fr/free/nrw/commons/Media.java
#	app/src/main/java/fr/free/nrw/commons/contributions/Contribution.java
#	app/src/main/java/fr/free/nrw/commons/upload/UploadService.java
2020-04-07 11:35:01 +01: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-04-07 11:35:01 +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 #3503 Remove Title/Caption From MediaUploadDetail and only use Caption/Description pairs (#3578) 2020-03-26 20:17:05 +10:00