Fix holiday class
Conflicts: htdocs/holiday/class/holiday.class.php
This commit is contained in:
parent
ac80d4057d
commit
f36dea5be7
Conflicts: htdocs/holiday/class/holiday.class.php