Dominic Clifton bf13a11dc2 Merge remote-tracking branch 'multiwii/master' ... Conflicts: _locales/en/messages.json changelog.html js/data_storage.js js/protocols/stm32.js manifest.json tabs/auxiliary_configuration.js tabs/default.css tabs/default.html tabs/firmware_flasher.js tabs/servos.js		2014-09-04 01:40:24 +01:00
..
messages.json	Merge remote-tracking branch 'multiwii/master'	2014-09-04 01:40:24 +01:00