Laurent Destailleur
be8e48b265
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
2018-10-31 15:38:29 +01:00
..
2018-10-06 21:00:26 +02:00
2018-10-10 01:16:53 +02:00
2018-10-30 22:32:42 +01:00
2018-07-16 15:44:44 +02:00
2018-04-16 13:51:16 +02:00
2018-10-26 15:04:02 +02:00
2018-10-30 12:41:34 +01:00
2018-10-09 14:52:53 +02:00
2018-10-31 15:38:29 +01:00
2018-10-29 02:14:41 +01:00
2018-10-02 22:35:51 +02:00
2018-06-19 09:21:23 +02:00
2018-04-07 12:30:30 +02:00
2018-10-29 02:27:51 +01:00
2018-08-21 12:54:02 +02:00
2018-09-05 23:25:17 +02:00
2018-04-22 20:08:29 +02:00
2018-04-21 12:00:55 +02:00
2018-06-19 13:10:13 +02:00
2018-06-04 21:49:29 +02:00
2018-04-21 12:00:55 +02:00