jobobby04 50097eef9f Fixes for merging from upstream ...

(cherry picked from commit 5f2eb19ea37ba191d414eee4e8f45f20f1a73e89)

2020-05-03 13:22:39 -04:00

..

src

Fixes for merging from upstream

2020-05-03 13:22:39 -04:00

.gitignore

Move google-services.json

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

build.gradle

Reenable Proguard

2020-05-03 01:38:48 -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