8be1329a71
Conflicts: octoprint/printer.py octoprint/static/js/ui.js octoprint/templates/index.jinja2 octoprint/util/comm.py |
||
---|---|---|
.. | ||
dialogs.jinja2 | ||
index.jinja2 | ||
settings.jinja2 |
8be1329a71
Conflicts: octoprint/printer.py octoprint/static/js/ui.js octoprint/templates/index.jinja2 octoprint/util/comm.py |
||
---|---|---|
.. | ||
dialogs.jinja2 | ||
index.jinja2 | ||
settings.jinja2 |