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

Merge branch 'develop-favorite' of github.com:aspangaro/dolibarr into

aspangaro-develop-favorite

Conflicts:
	htdocs/core/class/html.form.class.php
parents 1fad543f b465d715
Branches
Tags
No related merge requests found
Showing
with 127 additions and 138 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment