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

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

Conflicts:
	.travis.yml
	htdocs/contrat/class/contrat.class.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/core/modules/project/pdf/pdf_baleine.modules.php
parents b47dc8a3 c1c0fa88
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 18 additions and 14 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment