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

Merge commit '181ffcca'

Conflicts:
	src/annotationForm/AnnotationDrawing.js
	src/annotationForm/AnnotationFormOverlay/KonvaDrawing/shapes/ParentComponent.js
	src/annotationForm/KonvaDrawing/shapes/ParentComponent.js
parents 86038559 181ffcca
No related branches found
No related tags found
No related merge requests found
Showing
with 632 additions and 534 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment