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
..
src	Combine author and artist fields in manga info	2020-06-14 16:26:12 -04:00
.gitignore	Move google-services.json	2020-04-29 17:56:05 -04:00
build.gradle	Bump dependencies	2020-06-14 16:26:12 -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