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

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

develop

Conflicts:
	ChangeLog
parents 4cf84c4e d5eaaaaf
Branches master
No related tags found
No related merge requests found
Showing
with 77 additions and 57 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment