Laurent Destailleur
ccca46f380
Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
htdocs/comm/propal.php
htdocs/comm/propal/list.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/core/lib/functions.lib.php
htdocs/expedition/note.php
htdocs/fourn/commande/liste.php
htdocs/fourn/facture/fiche.php
htdocs/main.inc.php
htdocs/projet/tasks/index.php
htdocs/theme/eldy/style.css.php
2014-05-29 19:20:48 +02:00
..
2014-05-29 19:20:48 +02:00
2014-05-03 18:18:44 +02:00
2013-01-25 11:37:30 +01:00
2014-05-03 18:18:44 +02:00
2014-05-26 13:51:25 +02:00
2014-01-13 09:43:21 +01:00
2014-05-03 18:18:44 +02:00
2014-05-29 19:20:48 +02:00
2014-05-03 18:18:44 +02:00
2014-05-03 18:18:44 +02:00
2014-05-18 11:52:52 +02:00
2014-05-03 18:18:44 +02:00
2014-05-29 19:20:48 +02:00