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

Merge branch 'dev' into 'qrcode'

# Conflicts:
#   plotid/example.py
#   tests/test_save_plot.py
parents 5d5b68f3 ad6a6043
Loading
Checking pipeline status
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment