(cherry picked from commit cd3cb72b65d2f5f6ec038eb319717e21e3a1731e) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchPresenter.kt |
||
|---|---|---|
| .. | ||
| eu/kanade | ||
| exh | ||
| xyz/nulldev/ts/api/http/serializer | ||
(cherry picked from commit cd3cb72b65d2f5f6ec038eb319717e21e3a1731e) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchPresenter.kt |
||
|---|---|---|
| .. | ||
| eu/kanade | ||
| exh | ||
| xyz/nulldev/ts/api/http/serializer | ||