Laurent Destailleur 4831fb4dcb Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/filefunc.inc.php

2017-03-19 11:26:49 +01:00

..

export.class.php

Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop

2017-03-19 11:26:49 +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