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

Merge branch 'develop-patch43' of https://github.com/aspangaro/dolibarr into... 

Merge branch 'develop-patch43' of https://github.com/aspangaro/dolibarr into aspangaro-develop-patch43

Conflicts:
	htdocs/contact/list.php
parents 6faf6eeb f9831f90
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 34 additions and 39 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