Skip to content
Snippets Groups Projects
Commit 0fbc10f7 authored by Mayr, Hannes's avatar Mayr, Hannes
Browse files

Merge branch 'new-year-developments' into...

Merge branch 'new-year-developments' into '18-optional-feature-to-install-missing-dependencies-via-pip-or'

# Conflicts:
#   plotid/plotoptions.py
#   plotid/tagplot.py
#   plotid/tagplot_image.py
#   plotid/tagplot_matplotlib.py
#   tests/test_tagplot_image.py
#   tests/test_tagplot_matplotlib.py
parents 3bee87ee bba01f22
No related branches found
No related tags found
1 merge request!62Export imported modules
Pipeline #888209 passed