darthpaul ed2bf87dc9 Merge branch 'master' into fix/android-data-dir-access
# Conflicts:
#	app/build.gradle
#	app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/MainActivity.kt
#	app/src/main/kotlin/com/simplemobiletools/filemanager/pro/adapters/ItemsAdapter.kt
2021-11-13 12:15:52 +00:00
..
2018-01-17 16:26:10 +01:00