Gina Häußge efca776102 Merge branch 'maintenance' into devel ... Conflicts: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2 src/octoprint/plugins/softwareupdate/updaters/update_script.py		2016-08-26 14:24:13 +02:00
..
_snippets/plugins/softwareupdate	Merge branch 'maintenance' into devel	2016-08-26 14:24:13 +02:00
softwareupdate.jinja2	rel="noopener noreferrer" for external links	2016-05-02 11:48:08 +02:00
softwareupdate_settings.jinja2	Merge branch 'maintenance' into devel	2016-08-26 14:24:13 +02:00
softwareupdate_wizard.jinja2	Wizard for software update plugin	2016-03-30 11:28:41 +02:00