dolibarr/htdocs/comm
Laurent Destailleur 358bb87ae2 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/action/index.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/payments.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/facture/doc/pdf_sponge.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/projet/card.php
	htdocs/public/payment/newpayment.php
	htdocs/societe/list.php
	htdocs/ticket/document.php
2021-04-13 20:19:05 +02:00
..
action Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-04-13 20:19:05 +02:00
admin Remove one thousand of useless files 2021-04-12 15:57:16 +02:00
mailing Remove one thousand of useless files 2021-04-12 15:57:16 +02:00
propal Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-04-13 20:19:05 +02:00
prospect FIX #yogosha5751 2021-03-29 22:43:39 +02:00
card.php Merge remote-tracking branch 'upstream/develop' into 14a22 2021-04-04 06:03:41 +02:00
contact.php FIX #yogosha5751 2021-03-29 22:43:39 +02:00
index.php Merge remote-tracking branch 'upstream/develop' into 14a36 2021-04-12 21:35:03 +02:00
multiprix.php FIX #yogosha5753 2021-04-01 10:11:54 +02:00
recap-client.php FIX #yogosha5751 2021-03-29 22:43:39 +02:00
remise.php Clean $_GET 2021-03-30 03:55:17 +02:00
remx.php FIX #yogosha5753 2021-04-01 10:11:54 +02:00