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