(cherry picked from commit 7094fef37f32c3c598c1808161a59085d27b26d3) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsTrackingController.kt # app/src/main/java/eu/kanade/tachiyomi/widget/preference/LoginPreference.kt # app/src/main/res/layout/pref_widget_imageview.xml |
||
|---|---|---|
| .. | ||
| eu/kanade/tachiyomi | ||
| exh | ||
| xyz/nulldev/ts/api/http/serializer | ||