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

Merge branch 'master' into loops

Browse Source 
Conflicts:
	core/lib/Thelia/Core/Template/Loop/Category.php
	core/lib/Thelia/Core/Template/Loop/FeatureValue.php
	core/lib/Thelia/Core/Template/Loop/Folder.php
	core/lib/Thelia/Core/Template/Loop/Product.php
	core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php
	install/faker.php
This commit is contained in:
Etienne Roudeix
2013-08-21 09:19:56 +02:00
parent 6a14bef3de a0b82879f5
commit 86b11096ba
3275 changed files with 929970 additions and 274940 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
documentation/api/files/Command/ContainerAwareCommand.php.txt Normal file → Executable file
View File

@@ -32,7 +32,8 @@ use Symfony\Component\DependencyInjection\ContainerAwareInterface;
*
* @author Fabien Potencier <fabien@symfony.com>
*/
class ContainerAwareCommand extends Command implements ContainerAwareInterface {
class ContainerAwareCommand extends Command implements ContainerAwareInterface
{
/**
* @var ContainerInterface
*/
@@ -58,3 +59,4 @@ class ContainerAwareCommand extends Command implements ContainerAwareInterface {
$this->container = $container;
}
}