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

Conflicts:
	htdocs/filefunc.inc.php

2017-01-20 12:09:39 +01:00

..

standard

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

2017-01-20 12:09:39 +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

init_menu_auguria.sql

Fix translation

2016-11-30 09:09:09 +01:00