Laurent Destailleur 4b9f54e571 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/install/mysql/data/llx_accounting.sql htdocs/install/mysql/migration/5.0.0-6.0.0.sql htdocs/install/mysql/tables/llx_holiday_config.sql		2017-09-01 17:34:57 +02:00
..
doc_generic_order_odt.modules.php	NEW Generated files are now indexed in database	2017-08-18 23:19:55 +02:00
index.html	Removed index.php and replaced them with blank index.html as it is more appropriate	2014-07-12 23:18:57 +02:00
pdf_einstein.modules.php	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-09-01 17:34:57 +02:00
pdf_proforma.modules.php	Fix doxygen	2016-05-18 14:43:56 +02:00