Public Git Hosting - inav.git/commit

commit	7d460e31cb4457b6216160c5895c2b36a64ec2ba
author	Roman Lut <11955117+RomanLut@users.noreply.github.com>
	Thu, 26 Oct 2023 15:41:11 +0000 (26 17:41 +0200)
committer	Roman Lut <11955117+RomanLut@users.noreply.github.com>
	Thu, 26 Oct 2023 15:41:11 +0000 (26 17:41 +0200)
tree	a72178c221c87fecc50a5155219266e39a93b546	tree \| snapshot (tar.gz zip)
parent	bd62d5f4115de32accb0e20d4753ffb6279b0711	commit \| diff
parent	692c61cff98ee601d6df6dfb19aa9d7f26b316e1	commit \| diff

Merge branch 'master' of https://github.com/iNavFlight/inav into osd-joystick

INAV: Navigation-enabled flight control software

docs/Settings.md	diff1 \|	diff2 \|	blob \| history
src/main/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
src/main/config/parameter_group_ids.h	diff1 \|	diff2 \|	blob \| history
src/main/drivers/timer_impl_stdperiph.c	diff1 \|	diff2 \|	blob \| history
src/main/fc/settings.yaml	diff1 \|	diff2 \|	blob \| history