Gina Häußge 780794c466 Merge branch 'development' of https://github.com/bwgan/OctoPrint into pr/bwgan/development ... Conflicts: src/octoprint/daemon.py		2016-01-29 09:04:58 +01:00
..
config_yaml.rst	Merge branch 'development' of https://github.com/bwgan/OctoPrint into pr/bwgan/development	2016-01-29 09:04:58 +01: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