Laurent Destailleur 2f2b0df6f8 Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/contact/exportimport.php htdocs/contact/info.php htdocs/core/class/commonobject.class.php htdocs/core/class/html.form.class.php htdocs/core/modules/DolibarrModules.class.php htdocs/core/modules/modSociete.class.php htdocs/core/tpl/document_actions_pre_headers.tpl.php htdocs/langs/fr_FR/categories.lang htdocs/main.inc.php htdocs/product/reassort.php htdocs/projet/list.php htdocs/societe/info.php		2015-07-19 12:26:31 +02:00
..
canvas	Qual: added deprecation hinting	2015-06-01 11:00:11 +02:00
class	Merge remote-tracking branch 'origin/3.7' into develop	2015-07-19 12:26:31 +02:00
card.php	Merge remote-tracking branch 'origin/3.7' into develop	2015-07-19 12:26:31 +02:00
document.php	Can't delete a project	2015-06-05 15:41:27 +02:00
index.html	Removed index.php and replaced them with blank index.html as it is more appropriate	2014-07-12 23:18:57 +02:00
info.php	Merge remote-tracking branch 'origin/3.7' into develop	2015-07-19 12:26:31 +02:00
ldap.php	Merge remote-tracking branch 'origin/3.6' into 3.7	2015-07-19 12:04:30 +02:00
list.php	Uniformize code	2015-06-30 13:14:19 +02:00
note.php	Merge remote-tracking branch 'origin/3.6' into 3.7	2015-02-20 23:47:09 +01:00
perso.php	Fix: [ bug #2570 ] [Contacts] Page should not process if ID is invalid	2015-07-19 11:21:21 +02:00
vcard.php	Merge remote-tracking branch 'origin/3.6' into 3.7	2015-07-19 12:04:30 +02:00