Laurent Destailleur d19ec89bf1 Merge remote-tracking branch 'origin/3.7' into 3.8 ...

Conflicts:
	htdocs/core/modules/modHoliday.class.php
	htdocs/holiday/card.php

2015-09-03 23:27:47 +02:00

..

index.html

Fix: add generic doc and use doc dir instead pdf

2014-09-25 12:44:57 +02:00

pdf_typhon.modules.php

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

2015-09-03 23:27:47 +02:00