Laurent Destailleur c175fbd697 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/website/class/website.class.php htdocs/website/index.php		2020-06-09 22:09:57 +02:00
..
class	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-06-09 22:09:57 +02:00
lib	Look and feel v12	2020-05-17 13:34:16 +02:00
samples	Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword	2020-05-23 18:34:58 +02:00
index.php	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-06-09 22:09:57 +02:00
websiteaccount_card.php	Fix common var name seems to be $objref for subdir of doc	2020-05-23 20:09:31 +02:00