Laurent Destailleur a5645b626c Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/core/tpl/objectline_view.tpl.php htdocs/projet/element.php		2015-03-11 03:55:46 +01:00
..
contrat.class.php	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-03-03 17:55:57 +01:00
index.html	readd index.html file	2015-02-02 11:13:11 +01:00