arkon 2f0f938d5e Update Conscrypt ... (cherry picked from commit 738a3999b4489830d4478cf2673cd10e2b05ef3c) # Conflicts: # app/build.gradle		2020-09-05 19:03:52 -04:00
..
src	Move share manga button to toolbar menu	2020-09-05 19:02:48 -04:00
.gitignore	Move google-services.json	2020-04-29 17:56:05 -04:00
build.gradle	Update Conscrypt	2020-09-05 19:03:52 -04:00
proguard-rules.pro	Likely fix Hitomi extension	2020-08-11 01:35:36 -04:00
shortcuts.xml	Merge sources and extensions into one view	2020-04-27 19:16:46 -04:00