Merge branch 'master' into delayed_safehome

Browse source

# Conflicts:
#	docs/Settings.md
#	src/main/fc/settings.yaml
#	src/main/navigation/navigation.c

...

This commit is contained in:

Alexander van Saase 2021-04-18 13:58:01 +02:00

parent a89eb8ceff 7f04e0f671

commit e5b2fef65c

381 changed files with 44228 additions and 5189 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

737

src/main/navigation/navigation.c

View file

File diff suppressed because it is too large Load diff