arkon 574d0bdcd5 Dependency updates ... (cherry picked from commit eef39b75a64db369b18adc963f6ea3952d0b4aac) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaAllInOneController.kt		2020-07-01 19:15:05 -04:00
..
src	Dependency updates	2020-07-01 19:15:05 -04:00
.gitignore	Move google-services.json	2020-04-29 17:56:05 -04:00
build.gradle	Dependency updates	2020-07-01 19:15:05 -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