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

Merge branch 'feat/test' into feat/traduction-modulaire

Conflicts:
	ui/ui-frontend/package-lock.json
	ui/ui-frontend/projects/pastis/src/app/app.component.html
	ui/ui-frontend/projects/pastis/src/app/notice/notice.component.html
	ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/edit-profile.component.html
	ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/edit-profile.component.ts
	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
	ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree/file-tree.component.html
	ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree/file-tree.component.ts
	ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree/file-tree.module.ts
	ui/ui-frontend/projects/pastis/src/app/profile/list-profile/list-profile.component.html
	ui/ui-frontend/projects/pastis/src/app/profile/list-profile/list-profile.component.ts
	ui/ui-frontend/projects/pastis/src/app/profile/profile.module.ts
parents 05f5df5d c46c94f0
No related branches found
No related tags found
Showing
with 407 additions and 291 deletions
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