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-12-21 14:58:18 +01:00
2014-10-04 17:20:17 +02:00
2014-12-26 04:02:01 +01:00
2014-12-26 04:44:15 +01:00
2014-11-28 02:05:40 +01:00
2014-10-08 15:09:07 +02:00
2014-09-18 20:33:37 +02:00
2014-12-26 04:44:15 +01:00
2014-06-14 14:20:58 +02:00
2014-09-18 20:33:37 +02:00
2014-12-04 11:14:02 +01:00
2014-05-26 13:51:25 +02:00
2014-10-04 17:20:17 +02:00
2014-09-18 20:33:37 +02:00
2014-12-04 11:03:48 +01:00