Jobobby04 0316cf47ed Fix merge with another crash(because of the kotlin dependency update)

2020-05-24 13:37:43 -04:00

..

src

Fix merge with another crash(because of the kotlin dependency update)

2020-05-24 13:37:43 -04:00

.gitignore

Move google-services.json

2020-04-29 17:56:05 -04:00

build.gradle

Update the coroutine dependency and fix issues that were causing the crash

2020-05-23 00:57:41 -04:00

proguard-rules.pro

merge double upstream

2020-05-02 23:39:46 -04:00

shortcuts.xml

Merge sources and extensions into one view

2020-04-27 19:16:46 -04:00