Merge remote-tracking branch 'upstream/main' into fix/drone-airspace

Browse Source

# Conflicts:
#	src/i18n/locales/uk.json

...

This commit is contained in:

Matt Van Horn committed 2026-10-30 00:14:42 -07:00

2 parents f01393c41d 423ca3ca5f

commit 4a74420e7b

159 files changed

+18844 -1999

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

No files matched your search

src/i18n/locales/ja.json

+2872

File diff suppressed because it is too large. Load diff