Merge branch 'master' into abo_stats_pages_auto_swap
commit6366bbf5b00e82bb328d6a19bfe1412fe01c7e82
authorbreadoven <56191411+breadoven@users.noreply.github.com>
Sat, 1 May 2021 09:38:21 +0000 (1 10:38 +0100)
committerGitHub <noreply@github.com>
Sat, 1 May 2021 09:38:21 +0000 (1 10:38 +0100)
treefad9a5a07433c3af48f64a1d2f112248b599d08a
parent36105393bb04cd24fe8674b99750e2b8bb610790
parent5a4aaedf8cd3a52f5bd0f64bde7b28de10a31053
Merge branch 'master' into abo_stats_pages_auto_swap
docs/Settings.md
src/main/fc/settings.yaml
src/main/io/osd.c
src/main/io/osd.h