arkon 03b3046ece Downgrade coroutines and flow-preferences ... (cherry picked from commit b47ee8857bd4198b803acd171d419837f793055d) # Conflicts: # app/build.gradle		2020-08-01 12:57:52 -04:00
..
src	Temporarily unrevert crop borders unification (closes #3487)	2020-08-01 12:53:54 -04:00
.gitignore	Move google-services.json	2020-04-29 17:56:05 -04:00
build.gradle	Downgrade coroutines and flow-preferences	2020-08-01 12:57:52 -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