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