Skip to content
Snippets Groups Projects
Commit 78ebffe4 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
	htdocs/install/fileconf.php
parents 6298436a 1b3544e7
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 31 additions and 17 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