Marion Muszynski ba706ec6c9 Merge branch 'ticket-fidelite'

2016-06-08 16:33:40 +02:00

..

prestashop

push site

2016-01-04 12:48:08 +01:00

site

Merge branch 'ticket-fidelite'

2016-06-08 16:33:40 +02:00

site_mobile

fix conflicts

2016-06-08 10:53:07 +02:00

debug.tpl

push site

2016-01-04 12:48:08 +01:00

index.php

push site

2016-01-04 12:48:08 +01:00

live_edit.tpl

push site

2016-01-04 12:48:08 +01:00