Commit 5e0946bd authored 10 years ago by Laurent Destailleur

Merge remote-tracking branch 'origin/3.6' into develop

Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/adherents/fiche.php
	htdocs/core/lib/date.lib.php
	htdocs/langs/fr_FR/bills.lang
	htdocs/resource/class/resource.class.php

parents f7e71d88 4f084080

Branches

Admin message

Merge remote-tracking branch 'origin/3.6' into develop