c6e15a7d32
Conflicts: octoprint/server.py octoprint/settings.py octoprint/templates/index.jinja2 |
||
---|---|---|
.. | ||
dialogs.jinja2 | ||
index.jinja2 | ||
settings.jinja2 |
c6e15a7d32
Conflicts: octoprint/server.py octoprint/settings.py octoprint/templates/index.jinja2 |
||
---|---|---|
.. | ||
dialogs.jinja2 | ||
index.jinja2 | ||
settings.jinja2 |