Laurent Destailleur fb8c3f01a4 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 ... Conflicts: htdocs/core/modules/project/doc/pdf_baleine.modules.php htdocs/core/modules/project/doc/pdf_beluga.modules.php		2018-12-18 21:35:30 +01:00
..
index.html	NEW #3510 : Standardize module	2016-03-23 22:45:04 +01:00
pdf_blochet.class.php	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-12-18 21:35:30 +01:00