Co-authored-by: jobobby04 <jobobby04@users.noreply.github.com> (cherry picked from commit 6993e88265c3a759916e5e9677cdf28351ca85d2) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/ComposeController.kt |
||
|---|---|---|
| .. | ||
| src | ||
| .gitignore | ||
| build.gradle.kts | ||
| proguard-android-optimize.txt | ||
| proguard-rules.pro | ||
| shortcuts.xml | ||