Skip to content
Snippets Groups Projects
Commit 67295447 authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

Merge remote-tracking branch 'origin/3.7' into develop

Conflicts:
	htdocs/projet/tasks/task.php
parents 860d0b08 f6be48f2
Branches
Tags
No related merge requests found
Showing
with 57 additions and 50 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment