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

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

Conflicts:
	ChangeLog
	build/makepack-dolibarr.pl
	htdocs/fichinter/list.php
	htdocs/product/list.php
	htdocs/projet/tasks/list.php
parents b8b91db0 6d01bd71
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 80 additions and 22 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