Laurent Destailleur 3d3edb19d8 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	.travis.yml
	htdocs/langs/en_US/commercial.lang

2018-09-02 15:48:26 +02: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

paybox.php

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

2018-09-02 15:48:26 +02:00