Joel Collins 7c59245753 Merge branch 'master' into 'rwb27-plugin-comments' ... # Conflicts: # docs/source/extensions/structure.rst		2020-03-24 11:17:11 +00:00
..
example_extension	Added docs for subclassing and lifecycle hooks	2020-03-24 10:22:39 +00:00
actions.rst	Wrote W3C sections	2020-01-22 15:17:40 +00:00
ev_gui.rst	Removed old plugin docs	2020-01-22 16:36:59 +00:00
introduction.rst	Removed old plugin docs	2020-01-22 16:36:59 +00:00
lifecycle_hooks.rst	Added docs for subclassing and lifecycle hooks	2020-03-24 10:22:39 +00:00
marshaling.rst	Moved status routes to instrument/state	2020-01-29 17:43:52 +00:00
properties.rst	Wrote W3C sections	2020-01-22 15:17:40 +00:00
structure.rst	Merge branch 'master' into 'rwb27-plugin-comments'	2020-03-24 11:17:11 +00:00
tasks_locks.rst	Wrote tasks and locks sections	2020-01-22 15:17:47 +00:00
views.rst	fixed a couple of trivial typos	2020-01-23 09:32:34 +00:00