(cherry picked from commit da8669c826e6575a76751842bda3da59dc2f07c7) (cherry picked from commit 4b7b710b7cc2e3526de176eb0eb72d763b32bcd7) # Conflicts: # app/src/test/java/eu/kanade/tachiyomi/util/chapter/ChapterRecognitionTest.kt
Includes 3e07100dc2725cb2d42050571232dd5d485b4de5 Co-authored-by: Saud-97 <Saud-97@users.noreply.github.com> (cherry picked from commit 4a71022a609711378df48b62725ee863353193c8) # Conflicts: # .github/workflows/build_pull_request.yml # .github/workflows/build_push.yml # app/src/test/java/eu/kanade/tachiyomi/CustomRobolectricGradleTestRunner.kt