Laurent Destailleur 2836368017 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/extrafields.class.php htdocs/filefunc.inc.php htdocs/takepos/css/phone.css htdocs/takepos/invoice.php		2020-05-28 20:20:39 +02:00
..
standard	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-05-28 20:20:39 +02:00
index.html
init_menu_auguria.sql	Debug v12	2020-04-28 02:58:33 +02:00