mirror of
https://github.com/meshtastic/Meshtastic-Android.git
synced 2026-09-13 13:48:00 -04:00
Conflicts, all re-integration of the April branch into the current tree: - MeshDataHandlerImpl/Test: keep main's constructor (ServiceScope, session context, geofence/beacon collaborators) and re-add remoteShellHandler. - Capabilities.kt: re-add supportsRemoteShell, still gated to UNRELEASED. - strings.xml: main re-sorted the file; re-insert remote_shell and phosphor_colour in their sorted positions. - NodesNavigation/AdministrationSection: union both sides.