(cherry picked from commit 78b9ac47667bff05abb68268537a23d95638eb14) # Conflicts: # app/src/main/AndroidManifest.xml |
||
|---|---|---|
| .. | ||
| src | ||
| .gitignore | ||
| build.gradle.kts | ||
| proguard-android-optimize.txt | ||
| proguard-rules.pro | ||
| shortcuts.xml | ||
(cherry picked from commit 78b9ac47667bff05abb68268537a23d95638eb14) # Conflicts: # app/src/main/AndroidManifest.xml |
||
|---|---|---|
| .. | ||
| src | ||
| .gitignore | ||
| build.gradle.kts | ||
| proguard-android-optimize.txt | ||
| proguard-rules.pro | ||
| shortcuts.xml | ||