Laurent Destailleur
eab44f62b1
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/actions_builddoc.inc.php
htdocs/core/class/html.form.class.php
htdocs/core/tpl/admin_extrafields_add.tpl.php
htdocs/core/tpl/admin_extrafields_edit.tpl.php
htdocs/core/tpl/admin_extrafields_view.tpl.php
htdocs/core/tpl/notes.tpl.php
htdocs/main.inc.php
htdocs/product/inventory/tpl/inventory.tpl.php
htdocs/societe/tpl/linesalesrepresentative.tpl.php
2017-12-21 14:35:33 +01:00
..
2017-10-24 18:05:43 +02:00
2017-12-08 16:15:41 +01:00
2017-09-08 13:23:12 +02:00
2017-12-21 13:32:16 +01:00
2017-12-01 17:22:32 +01:00
2017-10-03 14:50:52 +02:00
2017-10-03 14:50:52 +02:00
2014-07-12 23:18:57 +02:00
2017-11-23 20:24:05 +01:00
2017-10-03 14:50:52 +02:00
2017-12-12 11:31:30 +01:00
2017-10-03 14:50:52 +02:00