85bd12e731
(cherry picked from commitda8669c826) (cherry picked from commit4b7b710b7c) # Conflicts: # app/src/test/java/eu/kanade/tachiyomi/util/chapter/ChapterRecognitionTest.kt