Laurent Destailleur c06abac49e Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/compta/salaries/index.php htdocs/contact/class/contact.class.php htdocs/core/class/commonobject.class.php htdocs/core/lib/geturl.lib.php htdocs/core/lib/pdf.lib.php		2015-08-30 21:20:50 +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-08-30 21:20:50 +02:00
card.php	Fix bad link	2015-07-19 23:39:07 +02:00
document.php	Move my address email to new one	2015-07-15 20:30:33 +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	Fix use dedicated escapment function	2015-08-20 14:34:08 +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.7' into develop	2015-08-13 04:03:23 +02:00