Laurent Destailleur a3436135c9 Merge remote-tracking branch 'origin/3.6' into develop ... Conflicts: htdocs/projet/activity/list.php		2014-09-26 13:34:31 +02:00
..
index.php	Fix: Missing line total	2014-08-08 01:21:57 +02:00
list.php	Merge remote-tracking branch 'origin/3.6' into develop	2014-09-26 13:34:31 +02:00