Laurent Destailleur 68f6ebd0ff Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/commande/class/commande.class.php htdocs/core/lib/security.lib.php htdocs/modulebuilder/template/myobject_card.php		2018-10-30 14:47:39 +01:00
..
card.php	Merge remote-tracking branch 'upstream/develop' into patch-6	2018-09-09 13:35:58 +02:00
index.html	Move tab menu for subscription in member.lib	2016-09-24 06:48:40 +02:00
info.php	Standardize and update call to	2018-09-07 10:40:36 +02:00
list.php	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-10-30 14:47:39 +01:00