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

Merge remote-tracking branch 'origin/3.7' into develop

Conflicts:
	htdocs/core/modules/DolibarrModules.class.php
parents fe50a585 cc1d5066
No related branches found
No related tags found
No related merge requests found
Showing
with 82 additions and 48 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment