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

Merge remote-tracking branch 'origin/3.8' into 3.9 

Conflicts:
	htdocs/contrat/card.php
parents d33548e3 20e110a8
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment