Laurent Destailleur 4831fb4dcb Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/adherents/class/adherent.class.php htdocs/filefunc.inc.php		2017-03-19 11:26:49 +01:00
..
index.php	Merge duplicate menus/page on projects	2017-03-14 13:49:04 +01:00
perday.php	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-03-19 11:26:49 +01:00
perweek.php	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-03-19 11:26:49 +01:00