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
..
byproperties.php	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-09-14 02:49:19 +02:00
geo.php	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-09-14 02:49:19 +02:00
index.html	Move tab menu for subscription in member.lib	2016-09-24 06:48:40 +02:00
index.php	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-09-14 02:49:19 +02:00