Gina Häußge b6fbbb353a Merge branch 'maintenance' into devel ... # Conflicts: # CHANGELOG.md # src/octoprint/filemanager/storage.py # src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2		2016-09-09 12:31:29 +02:00
..
apps.rst	Documentation and changelog entries updated	2014-11-17 13:49:46 +01:00
connection.rst	Typo and spelling fixes	2016-01-28 18:59:38 +00:00
datamodel.rst	More work on the docs	2016-07-01 17:52:40 +02:00
fileops.rst	Merge branch 'maintenance' into devel	2016-09-09 12:31:29 +02:00
general.rst	Fixed a small issue with RFC 5987 headers arriving as unicode in parser	2016-09-07 18:44:46 +02:00
index.rst	Added triggering GCODE scripts to the REST API and custom controls	2015-03-06 16:04:43 +01:00
job.rst	Added only pause/resume sub commands to job API	2016-06-30 12:56:18 +02:00
logs.rst	Fixed a documentation bug	2015-09-28 13:08:35 +02:00
printer.rst	Add absolute jog mode to printer API	2016-07-01 17:54:26 +02:00
printerprofiles.rst	Fixed warnings in documentation build	2015-03-02 16:03:37 +01:00
push.rst	More work on JS Client documentation	2016-08-26 17:47:38 +02:00
slicing.rst	Typo correction in slicing.rst	2016-07-10 15:40:24 +03:00
version.rst	Added release notes for 1.1.0 and documentation of OctoPrint's events and the version resource	2014-08-31 15:17:32 +02:00