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-12-19 14:16:51 +01:00
2017-10-09 17:54:15 +01:00
2017-12-21 13:32:16 +01:00
2017-12-20 21:14:22 +01:00
2017-07-01 14:23:24 +02:00
2017-08-02 13:31:53 +02:00
2017-08-30 14:34:36 +02:00
2017-11-23 20:24:05 +01:00
2017-07-01 14:23:24 +02:00
2017-12-12 11:31:30 +01:00
2017-07-01 14:23:24 +02:00
2017-12-12 11:31:30 +01:00