(cherry picked from commit cef1c4b8a15246959e4e8a6708bec3c5d9bcaea8) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoHeaderAdapter.kt |
||
|---|---|---|
| .. | ||
| src | ||
| .gitignore | ||
| build.gradle | ||
| proguard-rules.pro | ||
| shortcuts.xml | ||
(cherry picked from commit cef1c4b8a15246959e4e8a6708bec3c5d9bcaea8) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoHeaderAdapter.kt |
||
|---|---|---|
| .. | ||
| src | ||
| .gitignore | ||
| build.gradle | ||
| proguard-rules.pro | ||
| shortcuts.xml | ||