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

Merge branch 'new-year-developments' into '108-id_method-given-input'

# Conflicts:
#   examples/image_example.py
#   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 d8fc9c50 7755ff06
No related branches found
No related tags found
1 merge request!61Custom IDs
Pipeline #888194 passed