1ac7043163
(cherry picked from commit 4bc2288806)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/data/database/models/Category.kt