(cherry picked from commit 5c868d784679b55e413366c5d4bdea75253bf8f4) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt |
||
|---|---|---|
| .. | ||
| eu/kanade | ||
| exh | ||
| xyz/nulldev/ts/api/http/serializer | ||
(cherry picked from commit 5c868d784679b55e413366c5d4bdea75253bf8f4) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt |
||
|---|---|---|
| .. | ||
| eu/kanade | ||
| exh | ||
| xyz/nulldev/ts/api/http/serializer | ||