Laurent Destailleur eef3824f8c Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/admin/categories.php htdocs/admin/dict.php htdocs/langs/de_DE/bills.lang htdocs/langs/en_US/main.lang htdocs/langs/fr_FR/bills.lang		2017-02-21 10:34:52 +01:00
..
standard	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-02-21 10:34:52 +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 menus	2017-02-20 11:29:30 +01:00