geeksville 48ea4f50fa Merge remote-tracking branch 'origin/master' into dev ...

# Conflicts:
#	app/src/main/java/com/geeksville/mesh/service/MeshService.kt
#	app/src/main/java/com/geeksville/mesh/ui/BTScanScreen.kt

2020-03-11 18:17:20 -07:00

..

src

Merge remote-tracking branch 'origin/master' into dev

2020-03-11 18:17:20 -07:00

.gitignore

gitignore

2020-02-19 10:54:29 -08:00

build.gradle

0.1.4 catch and report a rare? Compose exception

2020-03-09 18:54:33 -07:00

google-services.json

for now use my local google-services settings (for crashlytics)

2020-03-01 16:39:53 -08:00

proguard-rules.pro

initial checkin of virgin project

2020-01-20 15:53:22 -08:00