Laurent Destailleur 5c27ec5d25 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/menus/edit.php htdocs/compta/compta-files.php		2019-02-13 11:21:20 +01:00
..
edit.php	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-02-13 11:21:20 +01:00
index.php	Update index.php	2019-02-11 00:05:38 +01:00
other.php	Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma	2019-01-27 23:23:38 +01:00