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

Merge remote-tracking branch 'origin/3.4' into 3.5 

Conflicts:
	htdocs/core/tpl/objectline_edit.tpl.php
parents 3c87e1e2 6e9b8dc7
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