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

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

develop

Conflicts:
	htdocs/expensereport/card.php
	htdocs/projet/element.php
parents a23e2511 460c926f
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 477 additions and 355 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