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

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

Conflicts:
	htdocs/contrat/list.php
	htdocs/fichinter/list.php
parents 0aed9ecd d5d95c31
No related branches found
No related tags found
No related merge requests found
Showing
with 175 additions and 39 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment