Kevin Hester 5f6cb7637c Merge remote-tracking branch 'root/master' into dev1.2 ... # Conflicts: # app/src/main/java/com/geeksville/mesh/MainActivity.kt		2021-03-24 13:49:46 +08:00
..
.settings	…
special	…
src	Merge remote-tracking branch 'root/master' into dev1.2	2021-03-24 13:49:46 +08:00
.classpath	…
.gitignore	…
.project	…
build.gradle	update to sdk 30	2021-03-20 01:28:55 +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