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