Merge remote-tracking branch 'origin/Migrated-NearbyParentFragment-file-to-Kotlin' into Migrated-NearbyParentFragment-file-to-Kotlin

# Conflicts:
#	app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.kt
This commit is contained in:
Sujal-Gupta-SG 2025-02-03 18:23:13 +05:30
commit 6c8e1da420