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