Laurent Destailleur
657fc1b91c
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
ChangeLog
htdocs/comm/fiche.php
htdocs/core/lib/functions2.lib.php
htdocs/fourn/fiche.php
htdocs/langs/fr_FR/compta.lang
htdocs/projet/element.php
htdocs/projet/tasks/contact.php
htdocs/projet/tasks/time.php
2014-12-26 04:44:15 +01:00
..
2014-11-15 15:19:37 +01:00
2014-11-15 15:19:37 +01:00
2014-07-12 23:18:57 +02:00
2014-10-26 19:41:06 +01:00
2014-10-26 19:41:06 +01:00
2014-12-20 00:29:53 +01:00
2014-12-26 04:44:15 +01:00
2014-12-20 15:42:03 +01:00