Jobobby04 1cc36379e0 Revert "Combine author and artist fields in manga info" ... This reverts commit da7d3f3a9e. # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaAllInOneHolder.kt		2020-06-23 22:40:11 -04:00
..
java	Revert "Combine author and artist fields in manga info"	2020-06-23 22:40:11 -04:00
res	Revert "Combine author and artist fields in manga info"	2020-06-23 22:40:11 -04:00
AndroidManifest.xml	Cleanup android manifest	2020-06-14 17:51:58 -04:00
ic_launcher-web.png	Merge remote-tracking branch 'upstream/master'	2018-01-29 12:16:32 -05:00