Laurent Destailleur 4c1aa25b32 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/adherents/admin/adherent_emails.php htdocs/core/tpl/extrafields_list_search_title.tpl.php htdocs/product/traduction.php		2020-08-04 13:51:11 +02:00
..
adherent_emails.php	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-08-04 13:51:11 +02:00
adherent_extrafields.php	add new rule	2020-05-21 09:12:18 +02:00
adherent_type_extrafields.php	add new rule	2020-05-21 09:12:18 +02:00
adherent.php	add new rule	2020-05-21 09:12:18 +02:00
index.html	Move tab menu for subscription in member.lib	2016-09-24 06:48:40 +02:00
website.php	add new rule	2020-05-21 09:12:18 +02:00