Laurent Destailleur 3d96c5a454 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 ... Conflicts: htdocs/admin/dict.php htdocs/bom/tpl/objectline_create.tpl.php htdocs/bom/tpl/objectline_edit.tpl.php htdocs/bom/tpl/objectline_view.tpl.php htdocs/core/boxes/box_shipments.php htdocs/societe/class/societe.class.php		2021-01-06 20:20:37 +01:00
..
class	doxygen	2020-12-05 23:53:55 +01:00
lib	Scrutinizer Auto-Fixes	2020-10-31 13:32:18 +00:00
tpl	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0	2021-01-06 20:20:37 +01:00
bom_agenda.php	Scrutinizer Auto-Fixes	2020-10-31 13:32:18 +00:00
bom_card.php	Debug v13	2020-11-26 14:15:20 +01:00
bom_document.php	Fix path to files	2020-11-18 12:37:18 +01:00
bom_list.php	Debug v13	2020-12-03 10:13:13 +01:00
bom_note.php	end of dol_fiche_end	2020-10-27 18:19:31 +01:00
index.html	Protect from dir scan	2019-06-18 14:51:57 +02:00
modulebuilder.txt