Laurent Destailleur
42329b10c9
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
build/generate_filelist_xml.php
htdocs/comm/propal/card.php
htdocs/commande/card.php
htdocs/compta/facture/card.php
htdocs/core/class/commonobject.class.php
htdocs/core/lib/modulebuilder.lib.php
htdocs/fourn/commande/card.php
htdocs/fourn/facture/card.php
htdocs/supplier_proposal/card.php
htdocs/ticket/list.php
2021-03-02 15:27:20 +01:00
..
2021-03-02 02:55:24 +01:00
2021-02-23 20:46:19 +01:00
2021-02-23 20:46:19 +01:00
2021-03-02 15:27:20 +01:00
2021-02-23 20:46:19 +01:00
2021-02-23 20:46:19 +01:00
2021-02-23 20:46:19 +01:00
2021-02-23 20:46:19 +01:00
2021-02-23 20:46:19 +01:00
2021-02-23 20:46:19 +01:00
2021-02-23 20:46:19 +01:00