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

Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/class/evalmath.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/install/mysql/migration/11.0.0-12.0.0.sql
	htdocs/langs/en_US/cashdesk.lang
	htdocs/societe/class/societe.class.php

2020-07-04 13:13:17 +02:00

..

appearance.php

Fixes

2020-07-02 00:11:17 +02:00

bar.php

Fix can't find link to edit table plan

2020-06-30 12:07:24 +02:00

index.html

Create index.html

2019-11-26 17:55:33 +01:00

orderprinters.php

add new rule

2020-05-21 16:00:12 +02:00

other.php

CSS

2020-05-24 23:44:04 +02:00

printqr.php

Add security check

2020-06-20 12:21:14 +02:00

receipt.php

Fix phpcs

2020-06-24 20:03:12 +02:00

setup.php

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

2020-07-04 13:13:17 +02:00

terminal.php

FIX replace filter parameter "none" by "restricthtml"

2020-06-08 11:48:31 +02:00