Laurent Destailleur d7ad899839 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/contrat/card.php htdocs/core/class/conf.class.php htdocs/core/tpl/objectline_view.tpl.php htdocs/holiday/list.php		2018-03-20 14:52:27 +01:00
..
auguria_menu.php	Fix substition for menus title and urls	2017-12-09 15:35:01 +01:00
auguria.lib.php	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-02-12 14:01:34 +01:00
eldy_menu.php	Fix substition for menus title and urls	2017-12-09 15:35:01 +01:00
eldy.lib.php	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-03-20 14:52:27 +01:00
empty.php	Simpler top menu code	2018-02-05 23:06:48 +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