Skip to content
Snippets Groups Projects
Commit fb866d91 authored by Regis Houssin's avatar Regis Houssin
Browse files

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

into develop

Conflicts:
	htdocs/core/lib/ajax.lib.php
	htdocs/core/tpl/objectline_add.tpl.php
parents 2f14fbe7 cc22f25d
No related branches found
No related tags found
No related merge requests found
Expand all 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