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

Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 

Conflicts:
	htdocs/compta/facture/list.php
	htdocs/holiday/card.php
parents c6fc7313 fd5f992b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
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