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-10-04 17:20:17 +02:00
2014-12-25 21:47:39 +01:00
2014-12-25 23:08:07 +01:00
2014-12-25 23:08:07 +01:00
2014-11-23 17:43:06 +01:00
2014-11-23 00:51:13 +01:00
2014-12-26 04:44:15 +01:00
2014-09-18 21:18:25 +02:00
2014-10-04 17:20:17 +02:00
2014-11-23 17:43:52 +01:00
2014-09-18 21:18:25 +02:00