Merge branch 'master' into dev

This commit is contained in:
Vitor de Miranda Henrique
2018-06-19 23:16:14 -05:00
committed by GitHub

View File

@@ -1680,3 +1680,4 @@ def __plugin_load__():
"octoprint.comm.protocol.gcode.queuing": __plugin_implementation__.hook_gcode_queuing,
"octoprint.plugin.softwareupdate.check_config": __plugin_implementation__.get_update_information
}