Skip to content
Snippets Groups Projects
Commit 137f1c4e authored by florian HENRY's avatar florian HENRY
Browse files

Merge branch '4.0' of https://github.com/Dolibarr/dolibarr.git into 4.0

Conflicts:
	htdocs/resource/class/dolresource.class.php
parents f7bb2483 fead7967
No related branches found
No related tags found
No related merge requests found
Showing
with 81 additions and 56 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