Laurent Destailleur e0070bd348 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/modules/expedition/doc/pdf_rouget.modules.php htdocs/filefunc.inc.php		2018-11-06 18:30:57 +01:00
..
index.php	Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose	2018-10-24 23:04:26 +02:00
perday.php	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-11-06 18:30:57 +01:00
perweek.php	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-11-06 18:30:57 +01:00