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

Merge branch 'develop' of github.com:atm-maxime/dolibarr into 

atm-maxime-develop

Conflicts:
	htdocs/core/class/html.formprojet.class.php
parents 2dc3e5b1 dd83a52f
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