Laurent Destailleur a607ff4c1a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/core/lib/functions2.lib.php
	htdocs/core/lib/project.lib.php
	htdocs/langs/fr_FR/bills.lang
	htdocs/langs/fr_FR/products.lang
	htdocs/langs/fr_FR/stocks.lang
	htdocs/langs/fr_FR/ticket.lang
	htdocs/mrp/mo_card.php

2020-06-18 15:50:31 +02:00

..

class

Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop

2020-06-12 19:37:27 +02:00

lib

Fix for use with text browser

2020-06-10 12:46:55 +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-18 15:50:31 +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