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
..
admin
class	Merge remote-tracking branch 'origin/3.7' into develop	2015-05-31 03:30:38 +02:00
payment
stats
card.php
index.html
index.php
info.php
list.php