Skip to content
Snippets Groups Projects
Commit 9e5286bc authored by Maxime Kohlhaas's avatar Maxime Kohlhaas
Browse files

Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko862 

Conflicts:
	htdocs/core/class/html.formfile.class.php
parents 0d40debe a1e76636
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 23 additions and 21 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment