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

Merge commit 'ed8d9a0e' 

Conflicts:
	src/AnnotationCreation.js
	src/AnnotationDrawing.js
parents e6d755e0 ed8d9a0e
Branches
No related tags found
1 merge request!10Draft: MigratingAnnotationCreation to MUI5.
Pipeline #1788 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