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

Merge branch 'resources-fixes' of https://github.com/IonAgorria/dolibarr 

into IonAgorria-resources-fixes

Conflicts:
	htdocs/core/tpl/resource_add.tpl.php
	htdocs/resource/element_resource.php
parents 2abb9071 2e1e9017
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
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