2
0
forked from Wavyzz/dolibarr
Files
dolibarr-fork/htdocs/core/boxes
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
..
2020-10-07 13:01:28 +00:00
2020-12-10 17:09:25 +01:00
2020-10-31 13:32:18 +00:00
2020-10-31 13:32:18 +00:00
2020-10-31 13:32:18 +00:00
2020-12-11 02:12:39 +01:00
2020-10-31 13:32:18 +00:00
2020-10-31 13:32:18 +00:00
2021-01-05 10:39:53 +01:00
2020-12-24 03:06:52 +01:00
2020-10-31 13:32:18 +00:00
2020-12-11 02:12:39 +01:00
2020-12-03 17:33:22 +01:00
2020-11-13 22:22:51 +01:00
2020-12-11 02:12:39 +01:00
2020-12-05 08:58:20 +01:00
2020-10-31 13:32:18 +00:00
2020-12-29 17:04:39 +01:00
2020-12-11 02:12:39 +01:00
2020-12-24 03:06:52 +01:00