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

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

Conflicts:
	htdocs/core/lib/functions.lib.php
parents c7313210 1db6d86c
No related branches found
No related tags found
No related merge requests found
Showing
with 39 additions and 33 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment