(cherry picked from commit e691e17efc0a6c857a925bf4077f0eb3541d570b) # 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 e691e17efc0a6c857a925bf4077f0eb3541d570b) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/more/AboutController.kt # app/src/main/java/eu/kanade/tachiyomi/ui/more/AboutLinksPreference.kt