Marion Muszynski 1dc2a7f6b2 fix conflict

2017-10-17 16:29:54 +02:00

..

ajax_summary.php

addition of crons and admin_order tpl for Mondial Relay

2017-01-11 15:53:24 +01:00

cron_agencies.php

add test mondial reprint

2017-02-15 12:10:01 +01:00

cron_relais.php

addition of crons and admin_order tpl for Mondial Relay

2017-01-11 15:53:24 +01:00

cron_shipping.php

fill prtmis field for mondial relay dpc

2017-08-28 10:04:09 +02:00

cron_trace.php

fix conflict

2017-10-17 16:29:54 +02:00

cron_tri.php

addition of crons and admin_order tpl for Mondial Relay

2017-01-11 15:53:24 +01:00

getsummary.php

addition of crons and admin_order tpl for Mondial Relay

2017-01-11 15:53:24 +01:00

mondialrelay.php

formatting error message

2017-08-22 16:21:08 +02:00

pltri.txt

Revert "Revert "fix from prod""

2017-09-01 11:22:11 +02:00

print_summary.tpl

addition of crons and admin_order tpl for Mondial Relay

2017-01-11 15:53:24 +01:00

relais.txt

Revert "Revert "fix from prod""

2017-09-01 11:22:11 +02:00