Laurent Destailleur 4768729c09 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/comm/propal/list.php htdocs/commande/list.php htdocs/compta/facture/list.php htdocs/core/class/rssparser.class.php htdocs/core/tpl/admin_extrafields_view.tpl.php htdocs/core/tpl/extrafields_list_search_sql.tpl.php htdocs/expedition/list.php		2021-05-17 07:57:32 +02:00
..
card.php	Update card.php	2021-05-17 07:08:45 +02:00
ldap.php	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-05-17 07:57:32 +02:00
list.php
perms.php