Meshtastic-Android/app/src
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
..
androidTest/java/com/geeksville/mesh add beginnings of radio interface service 2020-01-24 17:05:55 -08:00
main Merge remote-tracking branch 'origin/master' into dev 2020-03-11 18:17:20 -07:00
test/java/com/geeksville/mesh add distance unit test and fix bug reported via crashyltics 2020-02-29 07:59:57 -08:00