Laurent Destailleur 59bc8ee07c Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/adherents/stats/byproperties.php htdocs/adherents/stats/geo.php htdocs/admin/system/dolibarr.php htdocs/core/class/commonobjectline.class.php htdocs/core/tpl/objectline_title.tpl.php htdocs/langs/en_US/admin.lang htdocs/product/class/product.class.php		2020-09-14 02:49:19 +02:00
..
adherent_type.class.php	Scrutinizer Auto-Fixes	2020-09-07 08:18:17 +00:00
adherent.class.php	Standardize code around model_pdf	2020-09-10 01:49:09 +02:00
adherentstats.class.php	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-09-14 02:49:19 +02:00
api_members.class.php	Update api_members.class.php	2020-08-29 12:44:17 +02:00
api_memberstypes.class.php	Standardize code around model_pdf	2020-09-10 01:49:09 +02:00
api_subscriptions.class.php	add new rule	2020-05-21 09:21:30 +02:00
index.html
subscription.class.php	Update subscription.class.php	2020-06-07 16:12:28 +02:00