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

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

Conflicts:
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
parents a8c3ce4e b63ad019
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment