Kevin Hester 2fc4099bfc Merge branch 'dev' into dev1.2 ...

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

2021-03-02 14:38:55 +08:00

..

.settings

Don't include firmware in development builds (speeds install time)

2020-06-28 14:55:02 -07:00

special

more mock files

2020-04-02 22:27:55 -07:00

src

Merge branch 'dev' into dev1.2

2021-03-02 14:38:55 +08:00

.classpath

Don't include firmware in development builds (speeds install time)

2020-06-28 14:55:02 -07:00

.gitignore

gitignore

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

.project

Don't include firmware in development builds (speeds install time)

2020-06-28 14:55:02 -07:00

build.gradle

1.1.50

2021-03-02 14:19:44 +08:00

google-services-example.json

mock google-services in CI builds

2020-04-02 22:07:35 -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

potential fix for the rare mapbox native crash (use onDestroyView)

2021-02-01 22:54:04 +08:00