Laurent Destailleur 5e0946bdc2 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

2014-11-05 16:37:07 +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

rapport.pdf.php

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

2014-11-05 16:37:07 +01:00