dolibarr/htdocs/comm
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
..
action Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-27 00:38:51 +02:00
admin Scrutinizer Auto-Fixes 2020-04-10 08:59:32 +00:00
mailing Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-20 12:28:14 +02:00
propal Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-07-04 13:13:17 +02:00
prospect add new rule 2020-05-21 15:05:19 +02:00
card.php Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-07-04 13:13:17 +02:00
contact.php add new rule 2020-05-21 15:05:19 +02:00
index.php add new rule 2020-05-21 15:05:19 +02:00
multiprix.php add new rule 2020-05-21 15:05:19 +02:00
recap-client.php add new rule 2020-05-21 15:05:19 +02:00
remise.php add new rule 2020-05-21 15:05:19 +02:00
remx.php add new rule 2020-05-21 15:05:19 +02:00