From 7de92070d7333c1a8848219c4b2d983a6dcd8cbd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 29 Jun 2019 16:46:16 +0200
Subject: [PATCH] Merge branch 'develop' of
 git@github.com:Dolibarr/dolibarr.git into develop

Conflicts:
	htdocs/contrat/card.php
	htdocs/contrat/class/contrat.class.php
---
 htdocs/{commande => }/contrat/admin/contract_extrafields.php    | 0
 htdocs/{commande => }/contrat/admin/contractdet_extrafields.php | 0
 htdocs/{commande => }/contrat/admin/index.html                  | 0
 htdocs/{commande => }/contrat/card.php                          | 0
 htdocs/{commande => }/contrat/class/api_contracts.class.php     | 0
 htdocs/{commande => }/contrat/class/contrat.class.php           | 0
 htdocs/{commande => }/contrat/class/index.html                  | 0
 htdocs/{commande => }/contrat/contact.php                       | 0
 htdocs/{commande => }/contrat/document.php                      | 0
 htdocs/{commande => }/contrat/index.php                         | 0
 htdocs/{commande => }/contrat/info.php                          | 0
 htdocs/{commande => }/contrat/list.php                          | 0
 htdocs/{commande => }/contrat/note.php                          | 0
 htdocs/{commande => }/contrat/services_list.php                 | 0
 htdocs/{commande => }/contrat/tpl/index.html                    | 0
 htdocs/{commande => }/contrat/tpl/linkedobjectblock.tpl.php     | 0
 16 files changed, 0 insertions(+), 0 deletions(-)
 rename htdocs/{commande => }/contrat/admin/contract_extrafields.php (100%)
 rename htdocs/{commande => }/contrat/admin/contractdet_extrafields.php (100%)
 rename htdocs/{commande => }/contrat/admin/index.html (100%)
 rename htdocs/{commande => }/contrat/card.php (100%)
 rename htdocs/{commande => }/contrat/class/api_contracts.class.php (100%)
 rename htdocs/{commande => }/contrat/class/contrat.class.php (100%)
 rename htdocs/{commande => }/contrat/class/index.html (100%)
 rename htdocs/{commande => }/contrat/contact.php (100%)
 rename htdocs/{commande => }/contrat/document.php (100%)
 rename htdocs/{commande => }/contrat/index.php (100%)
 rename htdocs/{commande => }/contrat/info.php (100%)
 rename htdocs/{commande => }/contrat/list.php (100%)
 rename htdocs/{commande => }/contrat/note.php (100%)
 rename htdocs/{commande => }/contrat/services_list.php (100%)
 rename htdocs/{commande => }/contrat/tpl/index.html (100%)
 rename htdocs/{commande => }/contrat/tpl/linkedobjectblock.tpl.php (100%)

diff --git a/htdocs/commande/contrat/admin/contract_extrafields.php b/htdocs/contrat/admin/contract_extrafields.php
similarity index 100%
rename from htdocs/commande/contrat/admin/contract_extrafields.php
rename to htdocs/contrat/admin/contract_extrafields.php
diff --git a/htdocs/commande/contrat/admin/contractdet_extrafields.php b/htdocs/contrat/admin/contractdet_extrafields.php
similarity index 100%
rename from htdocs/commande/contrat/admin/contractdet_extrafields.php
rename to htdocs/contrat/admin/contractdet_extrafields.php
diff --git a/htdocs/commande/contrat/admin/index.html b/htdocs/contrat/admin/index.html
similarity index 100%
rename from htdocs/commande/contrat/admin/index.html
rename to htdocs/contrat/admin/index.html
diff --git a/htdocs/commande/contrat/card.php b/htdocs/contrat/card.php
similarity index 100%
rename from htdocs/commande/contrat/card.php
rename to htdocs/contrat/card.php
diff --git a/htdocs/commande/contrat/class/api_contracts.class.php b/htdocs/contrat/class/api_contracts.class.php
similarity index 100%
rename from htdocs/commande/contrat/class/api_contracts.class.php
rename to htdocs/contrat/class/api_contracts.class.php
diff --git a/htdocs/commande/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
similarity index 100%
rename from htdocs/commande/contrat/class/contrat.class.php
rename to htdocs/contrat/class/contrat.class.php
diff --git a/htdocs/commande/contrat/class/index.html b/htdocs/contrat/class/index.html
similarity index 100%
rename from htdocs/commande/contrat/class/index.html
rename to htdocs/contrat/class/index.html
diff --git a/htdocs/commande/contrat/contact.php b/htdocs/contrat/contact.php
similarity index 100%
rename from htdocs/commande/contrat/contact.php
rename to htdocs/contrat/contact.php
diff --git a/htdocs/commande/contrat/document.php b/htdocs/contrat/document.php
similarity index 100%
rename from htdocs/commande/contrat/document.php
rename to htdocs/contrat/document.php
diff --git a/htdocs/commande/contrat/index.php b/htdocs/contrat/index.php
similarity index 100%
rename from htdocs/commande/contrat/index.php
rename to htdocs/contrat/index.php
diff --git a/htdocs/commande/contrat/info.php b/htdocs/contrat/info.php
similarity index 100%
rename from htdocs/commande/contrat/info.php
rename to htdocs/contrat/info.php
diff --git a/htdocs/commande/contrat/list.php b/htdocs/contrat/list.php
similarity index 100%
rename from htdocs/commande/contrat/list.php
rename to htdocs/contrat/list.php
diff --git a/htdocs/commande/contrat/note.php b/htdocs/contrat/note.php
similarity index 100%
rename from htdocs/commande/contrat/note.php
rename to htdocs/contrat/note.php
diff --git a/htdocs/commande/contrat/services_list.php b/htdocs/contrat/services_list.php
similarity index 100%
rename from htdocs/commande/contrat/services_list.php
rename to htdocs/contrat/services_list.php
diff --git a/htdocs/commande/contrat/tpl/index.html b/htdocs/contrat/tpl/index.html
similarity index 100%
rename from htdocs/commande/contrat/tpl/index.html
rename to htdocs/contrat/tpl/index.html
diff --git a/htdocs/commande/contrat/tpl/linkedobjectblock.tpl.php b/htdocs/contrat/tpl/linkedobjectblock.tpl.php
similarity index 100%
rename from htdocs/commande/contrat/tpl/linkedobjectblock.tpl.php
rename to htdocs/contrat/tpl/linkedobjectblock.tpl.php