Marion Muszynski 5c7c20a708 Merge branch 'ticket-14526-LoyaltyPaymentError' into develop		2017-10-19 17:16:13 +02:00
adm	fix conflict	2017-10-17 16:29:54 +02:00
cgi-bin
classes	show mr delivery address on invoice pdf	2017-07-07 12:15:20 +02:00
config	Merge branch 'add-CacheRedis' into develop	2017-09-25 12:29:11 +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	fix translations	2017-10-11 15:26:13 +02:00
modules	Merge branch 'ticket-14526-LoyaltyPaymentError' into develop	2017-10-19 17:16:13 +02:00
override	Merge branch 'ticket-14526-LoyaltyPaymentError' into develop	2017-10-19 17:13:41 +02:00
themes	Merge branch 'ticket-14526-LoyaltyPaymentError' into develop	2017-10-19 17:13:41 +02:00
tools	Fix error PHP5.5	2017-08-31 16:30:39 +02: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