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

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

Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/core/class/commonobject.class.php
parents 24aea45d 7b9d9c4d
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 41 additions and 30 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment