Michael RICOIS c1662e0472 Merge branch 'fix/payement-id_state' into develop ... Conflicts: override/controllers/OrderConfirmationController.php themes/site/header.tpl themes/site_mobile/header.tpl		2018-01-22 12:02:18 +01:00
..
classes	Merge branch 'fix/payement-id_state' into develop	2018-01-22 12:02:18 +01:00
controllers	Merge branch 'ticket/15099-facebookpixel'	2018-01-22 10:28:29 +01:00
index.php	push site	2016-01-04 12:48:08 +01:00