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

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

Conflicts:
	dev/skeletons/skeleton_list.php
parents 578eb98b fe053c86
No related branches found
No related tags found
No related merge requests found
Showing
with 209 additions and 35 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