Gina Häußge e4cc84b771 Merge branch 'master' into devel ... Conflicts: docs/index.rst setup.py src/octoprint/server/__init__.py src/octoprint/server/api/__init__.py src/octoprint/static/css/octoprint.css src/octoprint/static/gcodeviewer/js/renderer.js src/octoprint/static/js/app/viewmodels/printerstate.js src/octoprint/static/less/octoprint.less src/octoprint/templates/index.jinja2		2014-08-31 15:28:07 +02:00
..
api	Merge branch 'master' into devel	2014-08-31 15:28:07 +02:00
events	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
images	Forgot to git add image newly added to documentation	2014-06-07 18:23:55 +02:00
conf.py	We want the year in the docs to always be current	2014-08-08 17:14:50 +02:00
index.rst	Merge branch 'master' into devel	2014-08-31 15:28:07 +02:00
make.bat	Starting documentation based on Sphinx	2013-12-02 17:40:31 +01:00
Makefile	Starting documentation based on Sphinx	2013-12-02 17:40:31 +01:00