darthpaul 2438a35af8 Merge branch 'master' into feat/scoped-storage ... # Conflicts: # build.gradle # commons/build.gradle		2021-11-04 14:00:38 +00:00
..
src/main	Merge branch 'master' into feat/scoped-storage	2021-11-04 14:00:38 +00:00
.gitignore
build.gradle	wip: handle dynamic access to Android/[data|obb] in any volume.	2021-11-04 13:58:57 +00:00
proguard-rules.pro	updating gradle, glide	2019-10-04 11:46:53 +02:00