Laurent Destailleur ddb95e5765 Merge remote-tracking branch 'origin/3.6' into 3.7 ... Conflicts: htdocs/comm/mailing/fiche.php htdocs/compta/paiement/liste.php htdocs/contact/class/contact.class.php htdocs/core/lib/tax.lib.php htdocs/core/modules/expedition/doc/pdf_merou.modules.php htdocs/core/modules/expedition/doc/pdf_rouget.modules.php htdocs/langs/en_US/agenda.lang htdocs/webservices/server_contact.php		2015-02-10 21:33:43 +01:00
..
canvas	Fixed: Translations	2014-12-07 18:24:45 +01:00
class	Merge remote-tracking branch 'origin/3.6' into 3.7	2015-02-10 21:33:43 +01:00
card.php	Fixed: Translations	2014-12-07 18:24:45 +01:00
exportimport.php	Fixed: Translations	2014-12-07 18:24:45 +01: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.5' into 3.6	2014-09-13 19:10:05 +02:00
ldap.php	Fixed: Translations	2014-12-07 18:24:45 +01:00
list.php	Fixed: Translations	2014-12-07 18:24:45 +01:00
note.php	Fixed: Translations	2014-12-07 18:24:45 +01:00
perso.php	Fixed: Translations	2014-12-07 18:24:45 +01:00
vcard.php	Uniformize code: property "nom" for thirdparty is aliased into "name"	2014-10-04 17:20:17 +02:00