Teja
a7acc7f7f4
Merge remote-tracking branch 'upstream/maintenance' into upstream_merge
Conflicts:
requirements.txt
src/octoprint/filemanager/__init__.py
src/octoprint/plugins/cura/profile.py
src/octoprint/plugins/cura/static/js/cura.js
src/octoprint/plugins/cura/templates/cura_settings.jinja2
src/octoprint/plugins/svgtogcode/__init__.py
src/octoprint/printer/__init__.py
src/octoprint/server/__init__.py
src/octoprint/server/api/files.py
src/octoprint/server/api/printer.py
src/octoprint/server/api/settings.py
src/octoprint/settings.py
src/octoprint/static/js/app/main.js
src/octoprint/static/js/app/viewmodels/appearance.js
src/octoprint/static/js/app/viewmodels/connection.js
src/octoprint/static/js/app/viewmodels/control.js
src/octoprint/static/js/app/viewmodels/files.js
src/octoprint/static/js/app/viewmodels/gcode.js
src/octoprint/static/js/app/viewmodels/printerstate.js
src/octoprint/static/js/app/viewmodels/settings.js
src/octoprint/static/js/app/viewmodels/terminal.js
src/octoprint/templates/dialogs/settings.jinja2
src/octoprint/templates/dialogs/settings/serialconnection.jinja2
src/octoprint/templates/index.jinja2
src/octoprint/templates/navbar/settings.jinja2
src/octoprint/templates/stylesheets.jinja2
src/octoprint/util/comm.py