Skip to content
Snippets Groups Projects
Commit c72e7c10 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/core/lib/files.lib.php
parents fd3837e1 e7ad91d5
Branches
Tags
No related merge requests found
Showing with 174 additions and 121 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment