Etienne Roudeix 99038e688a Revert "Revert "Merge branch 'cleanmaster' into modules"" ...

This reverts commit b3ac365b45.

Conflicts:
	Readme.md
	core/lib/Thelia/Controller/Admin/AbstractCrudController.php
	core/lib/Thelia/Core/Template/Assets/AssetManagerInterface.php
	core/lib/Thelia/Core/Template/Assets/AsseticAssetManager.php
	core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
	core/lib/Thelia/Core/Template/TemplateDefinition.php
	core/lib/Thelia/Model/Base/Coupon.php
	core/lib/Thelia/Model/Base/CouponQuery.php
	core/lib/Thelia/Model/Base/CouponVersion.php
	core/lib/Thelia/Model/Base/CouponVersionQuery.php
	core/lib/Thelia/Model/Base/OrderCouponQuery.php

2014-01-06 11:25:25 +01:00

..

ajax

dynamic delivery modules on delivery front template

2013-12-20 12:14:20 +01:00

assets

Add missing page for folder

2013-12-09 15:00:52 +01:00

email

Merge

2013-11-28 22:32:39 +01:00

I18n

Traduction front

2013-12-10 10:17:54 +01:00

includes

Add missing page for folder

2013-12-09 15:00:52 +01:00

misc

need to unescape breadcrumb strings after been in array

2013-12-23 12:25:15 +01:00

404.html

Merge master

2013-11-27 20:24:38 +01:00

account-password.html

Merge master

2013-11-27 20:24:38 +01:00

account-update.html

Merge master

2013-11-27 20:24:38 +01:00

account.html

Merge master

2013-11-27 20:24:38 +01:00

address-update.html

Merge master

2013-11-27 20:24:38 +01:00

address.html

Merge master

2013-11-27 20:24:38 +01:00

cart.html

Merge master

2013-11-27 20:24:38 +01:00

category.html

Add SEO Meta to CATEGORY/PRODUCT/FOLDER/CONTENT

2013-12-09 15:00:51 +01:00

contact-success.html

Merge master

2013-11-27 20:24:38 +01:00

contact.html

Merge master

2013-11-27 20:24:38 +01:00

content.html

Add SEO Meta to CATEGORY/PRODUCT/FOLDER/CONTENT

2013-12-09 15:00:51 +01:00

currency.html

Merge master

2013-11-27 20:24:38 +01:00

folder.html

Add missing page for folder

2013-12-09 15:00:52 +01:00

index.html

Merge master

2013-11-27 20:24:38 +01:00

language.html

Merge master

2013-11-27 20:24:38 +01:00

layout.tpl

Add SEO Meta to CATEGORY/PRODUCT/FOLDER/CONTENT

2013-12-09 15:00:51 +01:00

login.html

Merge master

2013-11-27 20:24:38 +01:00

modal-address.html

Merge master

2013-11-27 20:24:38 +01:00

newsletter.html

Merge master

2013-11-27 20:24:38 +01:00

order-delivery.html

dynamic delivery modules on delivery front template

2013-12-20 12:14:20 +01:00

order-invoice.html

Revert "Revert "Merge branch 'cleanmaster' into modules""

2014-01-06 11:25:25 +01:00

order-placed.html

Merge master

2013-11-27 20:24:38 +01:00

password.html

Merge master

2013-11-27 20:24:38 +01:00

product.html

Merge branch 'master' into frontend

2013-12-16 15:45:04 +01:00

register.html

Merge master

2013-11-27 20:24:38 +01:00

search.html

Merge master

2013-11-27 20:24:38 +01:00

view_all.html

Merge master

2013-11-27 20:24:38 +01:00