(cherry picked from commit 33660de6b1f0497d6b9b293197dc289786194d40) # Conflicts: # build.gradle.kts |
||
|---|---|---|
| .. | ||
| src | ||
| .gitignore | ||
| build.gradle.kts | ||
| proguard-rules.pro | ||
| shortcuts.xml | ||
(cherry picked from commit 33660de6b1f0497d6b9b293197dc289786194d40) # Conflicts: # build.gradle.kts |
||
|---|---|---|
| .. | ||
| src | ||
| .gitignore | ||
| build.gradle.kts | ||
| proguard-rules.pro | ||
| shortcuts.xml | ||