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

Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 

develop

Conflicts:
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
parents e5de4c10 7efacecb
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 366 additions and 136 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment