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

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 

develop

Conflicts:
	htdocs/core/class/html.form.class.php
parents effba685 0899519d
No related branches found
No related tags found
No related merge requests found
Expand all Show whitespace changes
Inline Side-by-side
Showing
with 2303 additions and 149 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment