Skip to content
Snippets Groups Projects
Select Git revision
  • develop
  • feat/TU
  • fix/parcoursPUA
  • developGitlabNew
  • devlopGitlabNew/migration
  • developNew
  • merge_devlopCines_github
  • deploy/develop_standalone_deliver
  • deploy/develop_Baptiste
  • merge_github_gitlab
  • cines_feature_pastis_integration_ter
  • fix/sprint4_150322
  • fix/sprint4-1304
  • migration/pastisOVH
  • feat/211#321
  • deploy/sprint4_150322
  • deploy/develop
  • PR-1103
  • fix/Baptiste_front
  • feature/us217
20 results
Blame History Permalink
  • couzinie's avatar
    Resolve conflit to merge branch 'feat/test' into merge-breadcumb · 9d8fa46b
    couzinie authored 
    Conflicts:
	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.ts
	ui/ui-frontend/projects/pastis/src/app/profile/list-profile/list-profile.component.ts
    9d8fa46b