darthpaul 610b4dd1ad Merge branch 'master' into feat/scoped-storage ... # Conflicts: # commons/src/main/kotlin/com/simplemobiletools/commons/activities/BaseSimpleActivity.kt # commons/src/main/kotlin/com/simplemobiletools/commons/adapters/FilepickerItemsAdapter.kt		2021-11-13 09:57:55 +00:00
..
src/main	Merge branch 'master' into feat/scoped-storage	2021-11-13 09:57:55 +00:00
.gitignore
build.gradle	Merge branch 'master' into feat/scoped-storage	2021-11-04 18:48:44 +00:00
proguard-rules.pro