Merge remote-tracking branch 'origin/main' into tak-server-improvements

Browse source

# Conflicts:
#	Localizable.xcstrings
#	Meshtastic/Views/Settings/TAKServerConfig.swift

Co-authored-by: garthvh <1795163+garthvh@users.noreply.github.com>

...

This commit is contained in:

copilot-swe-agent[bot] 2026-04-02 16:37:15 +00:00 • committed by GitHub

parent 3c3876a5fe 9ceb34f1d5

commit 00f01a2a0b

1 changed files with 2 additions and 6221 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

6223

Localizable.xcstrings

View file

File diff suppressed because it is too large Load diff