Marion Muszynski 0cf41a41b1 Merge branch 'inte-white-fix' into develop		2017-11-06 12:07:27 +01:00
adm	Merge branch 'ticket-14525-parrain' into develop	2017-11-03 10:29:59 +01:00
cgi-bin
classes	fix offset i	2017-10-27 16:30:17 +02:00
config	Merge branch 'ticket-14436-WP' into develop	2017-10-27 13:12:23 +02:00
controllers	moving gift message to shopping cart step	2017-06-30 12:57:06 +02:00
css	Merge branch 'ticket-14162-returnwithqty' into develop	2017-09-26 15:27:37 +02:00
docs/csv_import
img
js	fix conflicts	2017-09-29 15:51:41 +02:00
localization
mails	Merge branch 'ticket-14273-voucher' into develop	2017-10-31 14:59:44 +01:00
modules	Merge branch 'ticket-14525-parrain' into develop	2017-11-03 10:29:59 +01:00
override	Merge branch 'add-CacheRedis'	2017-10-25 14:31:25 +02:00
themes	Merge branch 'inte-white-fix' into develop	2017-11-06 12:07:27 +01:00
tools	fix conflicts	2017-11-06 11:58:06 +01:00
webservice
.gitignore	add img folder, delete folder creation in installer and fix image view in category form	2017-01-09 13:18:54 +01:00
404.php
address.php
addresses.php
attachment.php
authentication.php
best-sales.php
cart.php
category.php
changecurrency.php
check_address.php	fix conflict	2016-05-19 13:17:54 +02:00
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