Gina Häußge a2cd46899c Merge branch 'improve/intermediaryUrlsAndTimeouts' into devel ... Conflicts: AUTHORS.md src/octoprint/plugins/virtual_printer/virtual.py		2016-07-06 13:32:03 +02:00
..
config_yaml.rst	Merge branch 'improve/intermediaryUrlsAndTimeouts' into devel	2016-07-06 13:32:03 +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