TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'refactor_action'

Browse Source 
Conflicts:
	core/lib/Thelia/Action/Product.php
	core/lib/Thelia/Controller/Admin/CategoryController.php
	core/lib/Thelia/Controller/Admin/ProductController.php
	core/lib/Thelia/Controller/Admin/TemplateController.php
This commit is contained in:
Manuel Raynaud
2013-09-30 10:26:59 +02:00
parent 2928d0d3c0 6c5e348b46
commit 7bf5ee31c9
116 changed files with 334 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/lib/Thelia/Model/Attribute.php
View File

@@ -5,7 +5,7 @@ namespace Thelia\Model;
use Thelia\Model\Base\Attribute as BaseAttribute;
use Propel\Runtime\Connection\ConnectionInterface;
use Thelia\Core\Event\TheliaEvents;
use Thelia\Core\Event\AttributeEvent;
use Thelia\Core\Event\Attribute\AttributeEvent;
class Attribute extends BaseAttribute {