Gina Häußge aae01fe81b Merge branch 'maintenance' into devel ... Conflicts: CHANGELOG.md docs/api/fileops.rst src/octoprint/plugins/virtual_printer/virtual.py src/octoprint/server/api/files.py src/octoprint/static/css/octoprint.css src/octoprint/static/js/app/dataupdater.js src/octoprint/static/js/app/main.js src/octoprint/static/js/app/viewmodels/files.js src/octoprint/static/js/app/viewmodels/settings.js src/octoprint/templates/sidebar/state.jinja2 src/octoprint/util/comm.py		2016-07-28 15:00:23 +02:00
..
config_yaml.rst	Merge branch 'maintenance' into devel	2016-07-28 15:00:23 +02:00
index.rst	More work on custom controls	2015-03-12 17:23:55 +01:00
logging_yaml.rst	Fixed a typo in the docs	2015-07-14 09:26:30 +02:00
yaml.rst	Typo and spelling fixes	2016-01-28 18:59:38 +00:00