978a8de32c
(cherry picked from commit d098eca69d)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/data/database/models/MangaChapterHistory.kt
# app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/ChapterSourceOrderPutResolver.kt