|
|
66ce4ee218
|
Inital commit
|
2020-11-19 15:36:28 +01:00 |
|
Manuel Raynaud
|
5e65bf0b8a
|
change license header
|
2014-04-18 09:36:41 +02:00 |
|
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 |
|
Etienne Roudeix
|
b3ac365b45
|
Revert "Merge branch 'cleanmaster' into modules"
This reverts commit d0ff5260f7, reversing
changes made to 67d0101dbe.
|
2013-12-20 11:16:42 +01:00 |
|
Manuel Raynaud
|
2f4158d1f6
|
fix cs
|
2013-12-18 10:04:13 +01:00 |
|
Etienne Roudeix
|
2eb5fc821c
|
mailing sytem admin
|
2013-10-28 12:24:59 +01:00 |
|
