mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-27 04:43:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
apps-android-commons/app/src
History
Exact
Sean Mac Gillicuddy 25226f9e79 Merge remote-tracking branch 'origin/master' into macgills/3832-unused-declarations 
# Conflicts:
#	app/src/main/java/fr/free/nrw/commons/explore/SearchActivity.java
#	app/src/main/java/fr/free/nrw/commons/explore/depictions/child/PageableChildDepictionsDataSource.kt
#	app/src/main/java/fr/free/nrw/commons/explore/depictions/media/DepictedImagesFragment.kt
#	app/src/main/java/fr/free/nrw/commons/explore/depictions/parent/PageableParentDepictionsDataSource.kt
#	app/src/main/java/fr/free/nrw/commons/explore/paging/FooterAdapter.kt
#	app/src/main/java/fr/free/nrw/commons/media/MediaInterface.java
#	app/src/main/java/fr/free/nrw/commons/mwapi/OkHttpJsonApiClient.java
#	app/src/test/kotlin/ModelFunctions.kt
#	app/src/test/kotlin/fr/free/nrw/commons/explore/categroies/PageableSearchCategoriesDataSourceTest.kt
#	app/src/test/kotlin/fr/free/nrw/commons/explore/depictions/child/PageableChildDepictionsDataSourceTest.kt
#	app/src/test/kotlin/fr/free/nrw/commons/explore/depictions/parent/PageableParentDepictionsDataSourceTest.kt
2020-06-25 13:54:17 +01:00
..
androidTest/java/fr/free/nrw/commons #3818 Convert SubDepictionListFragment to use Pagination (#3819) 2020-06-25 12:08:15 +03: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 macgills/3832-unused-declarations 2020-06-25 13:54:17 +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 remote-tracking branch 'origin/master' into macgills/3832-unused-declarations 2020-06-25 13:54:17 +01:00