Laurent Destailleur
80e470a4ce
Merge remote-tracking branch 'origin/3.3' into develop
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/compta/facture.php
htdocs/compta/facture/impayees.php
htdocs/compta/index.php
htdocs/core/boxes/box_produits_alerte_stock.php
htdocs/core/class/html.form.class.php
htdocs/core/modules/syslog/mod_syslog_file.php
htdocs/fourn/facture/impayees.php
htdocs/holiday/class/holiday.class.php
htdocs/holiday/fiche.php
2013-04-28 01:24:58 +02:00
..
2013-04-25 01:13:13 +02:00
2013-04-25 01:13:13 +02:00
2013-04-10 10:58:38 +02:00
2013-04-25 20:27:45 +02:00
2013-04-28 01:24:58 +02:00
2013-04-20 12:02:16 -07:00
2013-04-25 01:13:13 +02:00
2013-04-20 20:30:18 +02:00
2013-01-26 10:35:30 +01:00
2013-04-20 20:30:18 +02:00
2013-03-12 14:55:13 +01:00
2013-04-25 01:13:13 +02:00
2013-04-25 13:01:38 +02:00
2013-04-25 01:13:13 +02:00
2013-03-30 19:40:52 +01:00
2013-01-16 15:36:08 +01:00
2013-02-22 16:33:48 +01:00
2013-04-28 01:24:58 +02:00
2013-04-28 01:24:58 +02:00
2013-01-16 15:36:08 +01:00
2013-04-18 09:24:29 +02:00
2013-04-25 01:13:13 +02:00