Laurent Destailleur 7f8cbc0f62 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 ...

Conflicts:
	htdocs/adherents/type.php
	htdocs/contrat/services.php
	htdocs/contrat/tpl/linkedobjectblock.tpl.php
	htdocs/install/upgrade2.php

2018-02-14 22:08:18 +01: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 7.0

2018-02-14 22:08:18 +01:00

pdf_proforma.modules.php

Fix doxygen

2016-05-18 14:43:56 +02:00