(cherry picked from commit 8af8c57bb414beafb4eed2bfb448b072f2fe60e4) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/more/AboutController.kt # app/src/main/java/eu/kanade/tachiyomi/ui/more/AboutLinksPreference.kt
(cherry picked from commit 8af8c57bb414beafb4eed2bfb448b072f2fe60e4) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/more/AboutController.kt # app/src/main/java/eu/kanade/tachiyomi/ui/more/AboutLinksPreference.kt