Sean Mac Gillicuddy 1404bb0da6 Merge remote-tracking branch 'origin/master' into structured-data ... # Conflicts: # app/src/main/java/fr/free/nrw/commons/di/CommonsApplicationModule.java # app/src/main/java/fr/free/nrw/commons/repository/UploadRemoteDataSource.java # app/src/main/java/fr/free/nrw/commons/repository/UploadRepository.java # app/src/main/java/fr/free/nrw/commons/upload/UploadModel.java # app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaDetailFragment.java # app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaPresenter.java # app/src/test/kotlin/fr/free/nrw/commons/upload/FileProcessorTest.kt # app/src/test/kotlin/fr/free/nrw/commons/upload/UploadMediaPresenterTest.kt		2020-03-20 14:40:13 +00:00
..
src	Merge remote-tracking branch 'origin/master' into structured-data	2020-03-20 14:40:13 +00:00
build.gradle	#3222 remove lingering reference to depiction content provider	2020-03-20 11:29:36 +00: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