(cherry picked from commit 28fe7fec0658b5b4f4b51802ed99121c9ddf194e) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/browse/feed/FeedTab.kt
(cherry picked from commit 28fe7fec0658b5b4f4b51802ed99121c9ddf194e) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/browse/feed/FeedTab.kt