Gina Häußge 9de78001dd Merge branch 'maintenance' into devel ... # Conflicts: # CHANGELOG.md # docs/plugins/concepts.rst # src/octoprint/__init__.py # src/octoprint/server/__init__.py # src/octoprint/templates/javascripts.jinja2 # src/octoprint/timelapse.py Merge branch 'devel' into dev/wizard # Conflicts: # octoprint_octobullet/__init__.py # octoprint_octobullet/templates/octobullet_settings.jinja2 Merge branch 'devel' into dev/wizard # Conflicts: # octoprint_octobullet/__init__.py # octoprint_octobullet/templates/octobullet_settings.jinja2		2016-10-13 14:22:40 +02:00
..
_static	[Docs] RTD needs a little extra help to get the code tag colors fixed...	2015-03-19 21:05:27 +01:00
api	Docs for user API	2016-09-28 11:18:43 +02:00
bundledplugins	Fixed a link	2016-09-20 10:30:41 +02:00
configuration	Fixed two documentation bugs	2016-09-21 14:35:43 +02:00
development	More work on JS Client documentation	2016-08-26 17:47:38 +02:00
events	Better reporting of timelapse capture errors	2016-10-12 15:12:28 +02:00
features	Lots of documentation updates + some related code fixes	2016-09-22 16:27:06 +02:00
images	Migrated docs for all bundled plugins from wiki	2016-09-20 10:27:21 +02:00
jsclientlib	More docs & client fixes	2016-09-28 12:53:43 +02:00
modules	devel:newplugin => dev:plugin new, +dev:plugin install, +dev:plugin uninstall	2015-10-30 10:10:47 +01:00
plugins	Merge branch 'maintenance' into devel	2016-10-13 14:22:40 +02:00
sphinxext	Typo and spelling fixes	2016-01-28 18:59:38 +00:00
conf.py	Typo and spelling fixes	2016-01-28 18:59:38 +00:00
index.rst	Merge branch 'fix/pluginDocs' into dev/bundledPluginsDocs	2016-09-19 17:15:20 +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