feature: conflict resolved

This commit is contained in:
gaelle morin
2021-01-22 16:26:19 +01:00
38 changed files with 594 additions and 598 deletions

View File

@ -7,6 +7,6 @@
p
span(data-trans='project.left.paragraphJoin')
span  
solid-link.link(next="admin-project-list" data-trans='project.left.admin')
solid-link.link(next="admin-projects" data-trans='project.left.admin')
span  
span(data-trans='project.left.paragraphContact')