Laurent Destailleur 01aad8516d Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/adherents/list.php htdocs/compta/dons/card.php htdocs/compta/dons/class/don.class.php htdocs/contact/list.php htdocs/contrat/list.php htdocs/core/class/html.form.class.php htdocs/core/lib/security.lib.php htdocs/main.inc.php htdocs/product/stock/massstockmove.php htdocs/public/test/test_arrays.php htdocs/public/test/test_forms.php htdocs/societe/societe.php		2015-05-31 03:30:38 +02:00
..
canvas	Fixed: Translations	2014-12-07 18:24:45 +01:00
class	Merge remote-tracking branch 'origin/3.7' into develop	2015-05-31 03:30:38 +02:00
card.php	Merge remote-tracking branch 'origin/3.7' into develop	2015-05-31 03:30:38 +02:00
document.php	Uniformize code	2015-04-07 03:00:11 +02: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	Merge remote-tracking branch 'origin/3.7' into develop	2015-05-31 03:30:38 +02:00
note.php	Merge remote-tracking branch 'origin/3.6' into 3.7	2015-02-20 23:47:09 +01:00
perso.php	[Qual] Fixed HTML input form checked attribute	2015-05-07 14:21:14 +02:00
vcard.php	Uniformize code: property "nom" for thirdparty is aliased into "name"	2014-10-04 17:20:17 +02:00