Skip to content
Snippets Groups Projects
Commit 7d182c28 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/step1.php
	htdocs/projet/tasks/time.php
parents 99d24b8e 6bd219b1
No related branches found
No related tags found
No related merge requests found
Showing
with 111 additions and 67 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment