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

Prepare for option MAIN_GENERATE_PROPOSALS_WITH_PICTURE 

Conflicts:
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php

Conflicts:
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
parent 7c678533
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 55 additions and 40 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment