dolibarr/htdocs/public
Laurent Destailleur 3cbced439a Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/tools/listevents.php
	htdocs/compta/bank/line.php
	htdocs/compta/facture/class/facture-rec.class.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/compta/paiement/cheque/card.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/lib/date.lib.php
	htdocs/core/lib/ticket.lib.php
	htdocs/core/modules/mailings/modules_mailings.php
	htdocs/core/tpl/extrafields_view.tpl.php
	htdocs/core/tpl/objectline_view.tpl.php
	htdocs/cron/list.php
	htdocs/expedition/card.php
	htdocs/mrp/mo_list.php
	htdocs/product/stock/productlot_card.php
	htdocs/public/emailing/mailing-read.php
	htdocs/public/emailing/mailing-unsubscribe.php
	htdocs/ticket/list.php
	test/phpunit/FactureRecTest.php
2021-03-05 19:29:09 +01:00
..
agenda code syntax public dir 2021-02-26 18:58:34 +01:00
cron code syntax public dir 2021-02-26 18:58:34 +01:00
demo code syntax public dir 2021-02-26 18:58:34 +01:00
donations code syntax public dir 2021-02-26 18:58:34 +01:00
emailing Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-03-05 19:29:09 +01:00
members code syntax public dir 2021-02-26 18:58:34 +01:00
onlinesign code syntax public dir 2021-02-26 18:58:34 +01:00
opensurvey code syntax public dir 2021-02-26 18:58:34 +01:00
payment Merge remote-tracking branch 'upstream/develop' into fixmerge 2021-03-02 08:13:33 +01:00
project code syntax public dir 2021-02-26 18:58:34 +01:00
recruitment code syntax public dir 2021-02-26 18:58:34 +01:00
stripe code syntax public dir 2021-02-26 18:58:34 +01:00
test code syntax public dir 2021-02-26 18:58:34 +01:00
theme Fix restore dir at good place 2020-04-13 04:19:25 +02:00
ticket code syntax public dir 2021-02-26 18:58:34 +01:00
website code syntax public dir 2021-02-26 18:58:34 +01:00
error-401.php code syntax public dir 2021-02-26 18:58:34 +01:00
error-404.php code syntax public dir 2021-02-26 18:58:34 +01:00
index.php Fix restore dir at good place 2020-04-13 04:19:25 +02:00
notice.php code syntax public dir 2021-02-26 18:58:34 +01:00