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
..
src	Revert "Combine author and artist fields in manga info"	2020-06-23 22:40:11 -04:00
.gitignore	Move google-services.json	2020-04-29 17:56:05 -04:00
build.gradle	Stop IDE from complaining about missing translations	2020-06-19 21:16:39 -04:00
proguard-rules.pro	Fix Madokami extension username and password input	2020-06-08 22:06:38 -04:00
shortcuts.xml	Merge sources and extensions into one view	2020-04-27 19:16:46 -04:00