Michael RICOIS 9c8f93faa9 Merge branch 'ticket/r16345-lang' into develop ... Conflicts: .gitignore		2018-02-27 15:12:12 +01:00
..
prestashop	push site	2016-01-04 12:48:08 +01:00
site	Merge branch 'ticket/r16345-lang' into develop	2018-02-27 15:12:12 +01:00
site_mobile	Merge branch 'ticket-15629-new-landing' into develop	2018-02-23 18:48:15 +01: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