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

Merge branch 'patch-11' of github.com:defrance69/dolibarr into 

defrance69-patch-11

Conflicts:
	htdocs/core/class/commonobject.class.php
parents d5e0bcfa 8acd702c
Branches
Tags
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