dolibarr

mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-24 10:21:32 +01:00

Files

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

ajax

Escape hml tags

2017-06-18 19:42:59 +02:00

class

Standardize file names for ECM

2017-11-20 19:40:34 +01:00

tpl

Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop

2017-12-21 14:35:33 +01:00

dir_add_card.php

Standardize file names for ECM