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

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

Conflicts:
	htdocs/holiday/class/holiday.class.php
parents 2169a866 238bd76e
No related branches found
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment