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

..

boxes

Complete module template

2017-08-24 20:17:23 +02:00

modules

Debug blockedlog:

2017-12-15 16:56:08 +01:00

tpl

FIX security vulnerability reported by ADLab of Venustech

2017-12-21 13:32:16 +01:00

triggers

fix trigger when module not enabled

2017-11-14 10:20:43 +01:00