Marion Muszynski f280695772 fix conflicts		2017-04-25 15:04:54 +02:00
adm	fix conflicts	2017-04-25 15:04:54 +02:00
cgi-bin	test	2016-04-04 11:47:52 +02:00
classes	fix gift message on invoice pdf	2017-01-17 15:39:36 +01:00
config	fix	2016-06-07 10:54:19 +02:00
controllers
css	continuing changement	2016-12-23 13:04:16 +01:00
docs/csv_import
img
js	Merge branch 'ticket-12197-NewDiscountAdminOrder' into develop	2017-01-17 10:06:49 +01:00
localization
mails	fix conflict	2017-04-11 12:08:19 +02:00
modules	fix conflicts	2017-04-24 11:28:57 +02:00
override	Merge branch 'ticket-12487-HTTPS3'	2017-04-24 15:28:54 +02:00
themes	fix conflicts	2017-04-25 15:04:54 +02:00
tools	ca me gonfle !!	2016-06-07 11:58:31 +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	Revert "test"	2016-03-31 17:56:58 +02:00
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