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

Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/langs/en_US/banks.lang

2018-12-15 20:00:31 +01:00

..

standard

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

2018-12-15 20:00:31 +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

Merge branch 'develop' into PR_NEW_reception

2018-12-15 12:50:31 +01:00