Jobobby04 1202409b25 Merge branch 'release' ... # Conflicts: # app/build.gradle.kts # app/src/main/java/eu/kanade/presentation/webview/WebViewScreenContent.kt # app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt # app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt # app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt # app/src/main/java/exh/EXHMigrations.kt # app/src/main/java/exh/debug/DebugFunctions.kt		2023-10-29 19:03:29 -04:00
..
debug/res	Fix monochrome launcher icon not applied when non-round shape is used (#8552)	2022-11-24 15:20:59 -05:00
main	Merge branch 'release'	2023-10-29 19:03:29 -04:00
test/kotlin	Add favorite entry alternative handling, allowing parennt versions to take priority for favorites sync	2023-05-12 22:50:23 -04:00