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
..
class	NEW Clean code into salary module, debug and add indexes	2015-05-13 08:57:39 +02:00
charges.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
index.php	Update /compta/sociales/index.php	2014-11-23 17:44:25 +01:00
info.php	Removed closing php tag	2014-05-03 18:18:44 +02:00