Laurent Destailleur ed264182c6 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 ...

Conflicts:
	htdocs/admin/dict.php
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/product/card.php
	htdocs/takepos/receipt.php

2021-09-30 16:28:42 +02:00

..

appearance.php

…

bar.php

Fix trad

2021-04-28 18:32:49 +02:00

orderprinters.php

…

other.php

Clean page

2021-04-28 17:12:34 +02:00

printqr.php

…

receipt.php

Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0

2021-09-30 16:28:42 +02:00

setup.php

$_POST war

2021-03-24 19:53:31 +01:00

terminal.php

Fix trad

2021-04-28 18:32:49 +02:00