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

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

Conflicts:
	htdocs/accountancy/admin/categories.php
	htdocs/admin/dict.php
	htdocs/langs/de_DE/bills.lang
	htdocs/langs/en_US/main.lang
	htdocs/langs/fr_FR/bills.lang
parents 2dbae7b8 6c401106
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1570 additions and 186 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment