arkon 15b23e35cd Update dependencies, remove play-services-oss-licenses ... (cherry picked from commit 40639c0933b81881a206f185195389be13cf7cbb) # Conflicts: # app/build.gradle		2020-07-12 15:19:27 -04:00
..
src	fix batch add log	2020-07-12 15:16:52 -04:00
.gitignore	Move google-services.json	2020-04-29 17:56:05 -04:00
build.gradle	Update dependencies, remove play-services-oss-licenses	2020-07-12 15:19:27 -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