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