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

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

Conflicts:
	htdocs/main.inc.php
parents 06894a19 df9a6dae
Branches
Tags
No related merge requests found
Showing
with 160 additions and 87 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment