Skip to content
Snippets Groups Projects
Commit a1327e4a authored by naji's avatar naji
Browse files

Merge branch 'feat/test' into feat/Dupliquer_une_métadonnée

Conflicts:
	ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.html
	ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.ts
parents 6bbe9bd3 09ad4cc9
No related branches found
No related tags found
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment