Gina Häußge 111cf2c140 Merge branch 'fix/commTimeoutOnSupressedScriptCommands' into devel ... Conflicts: CHANGELOG.md src/octoprint/plugins/softwareupdate/__init__.py src/octoprint/plugins/virtual_printer/virtual.py src/octoprint/util/comm.py		2015-12-02 11:16:59 +01:00
..
__init__.py	Fixed some wrong indentation that somehow made it through editorconfig	2015-09-11 11:48:38 +02:00
virtual.py	Merge branch 'fix/commTimeoutOnSupressedScriptCommands' into devel	2015-12-02 11:16:59 +01:00