Commit Graph

2 Commits (835e665017e67720530aaa234540906080fa84ae)

Author SHA1 Message Date
Dominic Clifton a8cf910f51 Merge remote-tracking branch 'multiwii/master'
Conflicts:
	README.md
	_locales/en/messages.json
	changelog.html
	js/backup_restore.js
	js/data_storage.js
	js/msp.js
	js/protocols/stm32.js
	js/serial_backend.js
	main.css
	main.html
	main.js
	manifest.json
	tabs/auxiliary_configuration.css
	tabs/default.css
	tabs/firmware_flasher.js
	tabs/initial_setup.css
	tabs/initial_setup.html
	tabs/initial_setup.js
	tabs/modes.html
	tabs/modes.js
	tabs/motor_outputs.css
	tabs/motors.html
	tabs/receiver.css
	tabs/servos.js
10 years ago
cTn 4412f9c263 default and initial setup renamed to landing and setup, including object adjustments 10 years ago