Laurent Destailleur c8d232e056 Merge remote-tracking branch 'origin/3.8' into 3.9 ... Conflicts: htdocs/contrat/card.php		2016-01-28 12:18:25 +01:00
..
index.php	Fix several bugs on css, translation or look	2016-01-01 23:44:23 +01:00
perday.php	Merge remote-tracking branch 'origin/3.8' into 3.9	2016-01-28 12:18:25 +01:00
perweek.php	Merge remote-tracking branch 'origin/3.8' into 3.9	2016-01-28 12:18:25 +01:00