arkon da7d3f3a9e Combine author and artist fields in manga info ... (cherry picked from commit 395ca3630c8cf3cd608f1b9093e3894518683516) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoController.kt		2020-06-14 16:26:12 -04:00
..
arrays.xml	Fix unintended change	2020-05-03 02:08:13 -04:00
attrs.xml	merge double upstream	2020-05-02 23:39:46 -04:00
colors.xml	merge double upstream	2020-05-02 23:39:46 -04:00
dimens.xml	merge double upstream	2020-05-02 23:39:46 -04:00
ids.xml	merge double upstream	2020-05-02 23:39:46 -04:00
strings.xml	Combine author and artist fields in manga info	2020-06-14 16:26:12 -04:00
strings_extra.xml	Add Latest tab to show you up to 5 sources showing you their latest manga	2020-06-12 19:19:58 -04:00
styles.xml	Update some themes	2020-06-14 16:26:12 -04:00
themes.xml	Update some themes	2020-06-14 16:26:12 -04:00