(cherry picked from commit 8ea05e852efd621ee987c7e45d6db64a083eeffd)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/App.kt
(cherry picked from commit
|
||
|---|---|---|
| .. | ||
| src | ||
| .gitignore | ||
| build.gradle.kts | ||
| proguard-android-optimize.txt | ||
| proguard-rules.pro | ||
| shortcuts.xml | ||