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

Merge branch '3.6-patch' of github.com:aspangaro/dolibarr into 

aspangaro-3.6-patch

Conflicts:
	ChangeLog
parents 106b4a66 1405c03f
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