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
..
concepts.rst	Inject plugin_info object into plugin implementations as well	2016-10-13 12:03:05 +02:00
controlproperties.rst	Docs for settings overlay & improved hook docs	2016-08-19 15:40:43 +02:00
distributing.rst	Replaced broken link	2016-06-22 00:19:38 -06:00
gettingstarted.rst	Refactored plugin docs + improved docs on sortables	2016-03-24 16:42:41 +01:00
helpers.rst	Refactored plugin docs + improved docs on sortables	2016-03-24 16:42:41 +01:00
hooks.rst	Use better name than "hook" for various plugin hook documentation	2016-09-20 10:29:53 +02:00
index.rst	Restored accidentally removed file	2016-09-22 16:32:05 +02:00
injectedproperties.rst	Merge branch 'maintenance' into devel	2016-10-13 14:22:40 +02:00
mixins.rst	Refactored plugin docs + improved docs on sortables	2016-03-24 16:42:41 +01:00
viewmodels.rst	Renamed GcodeFileViewModel to FileViewModel	2016-09-01 10:17:18 +02:00