(cherry picked from commit 7382042288d68efc261984bc7e3939f8b931fb53) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/more/AboutController.kt |
||
|---|---|---|
| .. | ||
| src | ||
| .gitignore | ||
| build.gradle.kts | ||
| proguard-rules.pro | ||
| shortcuts.xml | ||
(cherry picked from commit 7382042288d68efc261984bc7e3939f8b931fb53) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/more/AboutController.kt |
||
|---|---|---|
| .. | ||
| src | ||
| .gitignore | ||
| build.gradle.kts | ||
| proguard-rules.pro | ||
| shortcuts.xml | ||