Laurent Destailleur 5455ab3280 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 ... Conflicts: htdocs/projet/card.php		2018-02-04 23:17:09 +01:00
..
doc_generic_proposal_odt.modules.php	NEW Generated files are now indexed in database	2017-08-18 23:19:55 +02:00
index.html
pdf_azur.modules.php	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-02-04 23:17:09 +01:00