deblan/FOSElasticaBundle
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch '2.0'

Browse source 
Conflicts:
	DependencyInjection/FOQElasticaExtension.php
	Manager/RepositoryManager.php
	README.md
	Resources/config/config.xml
	Resources/config/propel.xml
This commit is contained in:
Richard Miller 2012-01-12 16:34:19 +00:00
parent 2193976c2c ce82e8f591
commit 6eff104d6d
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
DependencyInjection/FOQElasticaExtension.php
View file

@ -409,4 +409,5 @@ class FOQElasticaExtension extends Extension
$container->setAlias('foq_elastica.manager', sprintf('foq_elastica.manager.%s', $defaultManagerService));
}
}
}

1
Resources/config/config.xml
View file

@ -67,6 +67,7 @@
<argument type="collection" /> <!-- transformers -->
<argument type="collection" /> <!-- options -->
</service>
</services>
</container>