Kevin Hester d3556ea9f9 Merge branch 'dev1.2' of https://github.com/geeksville/Meshtastic-Android into dev1.2 ...

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

2021-03-27 17:29:46 +08:00

..

.settings

…

special

…

src

Merge branch 'dev1.2' of https://github.com/geeksville/Meshtastic-Android into dev1.2

2021-03-27 17:29:46 +08:00

.classpath

…

.gitignore

…

.project

…

build.gradle

1.2.16

2021-03-27 17:26:58 +08:00

google-services-example.json

…

google-services.json

…

proguard-rules.pro

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

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