Laurent Destailleur 4e02b134da Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/filefunc.inc.php		2018-08-16 14:50:04 +02:00
..
doc_generic_project_odt.modules.php	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-08-16 14:50:04 +02:00
index.html
pdf_baleine.modules.php	Merge pull request #9035 from grandoc/new_branch_29_06_2018	2018-07-16 10:09:46 +02:00
pdf_beluga.modules.php	update code	2018-06-30 11:45:49 +02:00
pdf_timespent.modules.php	update code	2018-06-30 11:45:49 +02:00