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

Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 

Conflicts:
	htdocs/conf/conf.php.example
	htdocs/langs/en_US/mails.lang
parents 7fdd6ccb 534e2b12
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 58 additions and 11 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