Laurent Destailleur ecc30b8ffe Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/compta/facture/card.php

2019-01-27 18:27:58 +01:00

..

auguria_menu.php

Merge branch 'develop' into elseif

2019-01-27 17:54:06 +01:00

auguria.lib.php

Merge branch 'develop' into elseif

2019-01-27 17:54:06 +01:00

eldy_menu.php

Merge branch 'develop' into elseif

2019-01-27 17:54:06 +01:00

eldy.lib.php

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

2019-01-27 18:27:58 +01:00

empty.php

Merge branch 'develop' into elseif

2019-01-27 17:54:06 +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