Laurent Destailleur 2e4c6597d8 Merge remote-tracking branch 'origin/3.9' into develop ... Conflicts: htdocs/core/modules/expensereport/doc/pdf_standard.modules.php		2016-06-23 21:05:00 +02:00
..
pdf_standard.modules.php	Merge remote-tracking branch 'origin/3.9' into develop	2016-06-23 21:05:00 +02:00