Laurent Destailleur 59bd4749a8 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/menus/init_menu_auguria.sql htdocs/core/menus/standard/eldy.lib.php htdocs/product/class/product.class.php		2017-06-24 10:27:10 +02:00
..
standard	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-06-24 10:27:10 +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
init_menu_auguria.sql	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-06-24 10:27:10 +02:00