Skip to content
Snippets Groups Projects
Commit 95bda4aa authored by Anthony's avatar Anthony
Browse files

Merge branch 'mui5-tetras-main-stable' into 61-recettage-des-outils-d-annotation

# Conflicts:
#	package.json
#	src/AnnotationCreation.js
#	src/annotationForm/AnnotationFormContent.js
#	src/annotationForm/AnnotationFormDrawing.js
parents 37674e6b 0c728906
No related branches found
No related tags found
1 merge request!10Draft: MigratingAnnotationCreation to MUI5.
Showing
with 626 additions and 470 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment