Laurent Destailleur 8fd082cf16 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/hrm/hrm.php		2016-08-31 16:16:19 +02:00
..
standard	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop	2016-08-31 16:16:19 +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	add category entry menu into auguria menu sql	2016-08-29 10:47:13 +02:00