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

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

Conflicts:
	htdocs/core/class/extrafields.class.php
parents f987a433 e1efd881
No related branches found
No related tags found
No related merge requests found
Showing
with 243 additions and 64 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment