Skip to content
Snippets Groups Projects
Commit 2a19677c authored by Samuel Jugnet's avatar Samuel Jugnet
Browse files

Merge commit 'e2c3d285' 

Conflicts:
	src/AnnotationDrawing.js
parents acf3fc87 e2c3d285
No related branches found
No related tags found
1 merge request!10Draft: MigratingAnnotationCreation to MUI5.
Pipeline #1767 failed
Stage: test
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment