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

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

Conflicts:
	htdocs/core/modules/modHoliday.class.php
	htdocs/holiday/card.php
parents ce2e5e78 2e3d25c0
No related branches found
No related tags found
No related merge requests found
Showing
with 70 additions and 37 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment