Michael RICOIS bbec1c0ef4 Merge branch 'ticket/r16686-filter_back' into develop ... Conflicts: modules/filtervp/filter.tpl modules/filtervp/filtervp.php		2018-03-16 10:34:08 +01:00
adm	Merge branch 'ticket/r16490-email_error' into develop	2018-03-12 16:41:53 +01:00
cgi-bin
classes	Merge branch 'fix/cookie-dev' into develop	2018-03-14 12:03:27 +01:00
config	Merge branch 'ticket/r15109-math-captcha' into develop	2018-03-06 10:47:09 +01:00
controllers	Merge remote-tracking branch 'origin/ticket/r16455-exclude_bot'	2018-03-12 10:11:36 +01:00
css	Merge branch 'ticket/14716-order-mobile' into develop	2017-12-18 15:53:45 +01:00
docs/csv_import
img	images compressees	2017-11-30 12:42:25 +01:00
js	fix conflicts	2017-09-29 15:51:41 +02:00
localization
mails	Fix return link	2018-03-14 09:48:02 +01:00
modules	Merge branch 'ticket/r16686-filter_back' into develop	2018-03-16 10:34:08 +01:00
override	Merge branch 'ticket/r16686-filter_back' into develop	2018-03-15 17:38:51 +01:00
themes	Merge branch 'ticket/r15109-math-captcha' into develop	2018-03-06 10:47:09 +01:00
tools	Merge branch 'ticket/r15109-math-captcha' into develop	2018-03-06 10:47:09 +01:00
webservice
.gitignore	Merge branch 'ticket/r14647-welcome-mail'	2018-02-22 09:41:10 +01:00
404.php
address.php
addresses.php
attachment.php
authentication.php
best-sales.php
cart.php
category.php
changecurrency.php
check_address.php
cms.php
contact-form.php
discount.php
footer.php
get-file.php
guest-tracking.php
header.php
history.php
identity.php
images.inc.php
index.php
init.php
lessc.inc.php
manufacturer.php
my-account.php
new-products.php
order-confirmation.php
order-detail.php
order-follow.php
order-opc.php
order-return.php
order-slip.php
order.php
pagination.php
password.php
pdf-invoice.php
pdf-order-return.php
pdf-order-slip.php
prices-drop.php
product-sort.php
product.php
products-comparison.php
search.php
sitemap.php
statistics.php
stores.php
supplier.php
validation.php