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

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

Conflicts:
	htdocs/holiday/fiche.php
parents d2257b9f 711e7bf9
No related branches found
No related tags found
No related merge requests found
Showing
with 185 additions and 132 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment