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