Joel Collins 6f4791ec57 Merge branch 'master' into 'hotfix-2.0.x' ... # Conflicts: # openflexure_microscope/api/app.py # poetry.lock # pyproject.toml		2020-03-31 10:10:33 +00:00
..
default_extensions	Merge branch 'master' into 'hotfix-2.0.x'	2020-03-31 10:10:33 +00:00
example_extensions	Added web component example source	2020-03-26 12:02:58 +00:00
static	Updated eV Lite	2020-03-04 22:06:03 +00:00
utilities	Fixed rule cleaning	2020-03-11 10:24:37 +00:00
v2	Fixed broken delete argument (capture_id instead of id)	2020-03-17 17:15:52 +00:00
__init__.py	Removed old plugin system	2019-12-18 15:04:55 +00:00
app.py	Merge branch 'master' into 'hotfix-2.0.x'	2020-03-31 10:10:33 +00:00
microscope.py	Started basic rescue script	2020-03-03 16:13:21 +00:00