Richard Miller dce701b259 Merge branch '2.0' ... Conflicts: DependencyInjection/FOQElasticaExtension.php Manager/RepositoryManager.php Resources/config/mongodb.xml Resources/config/orm.xml Resources/config/propel.xml		2012-01-25 12:09:06 +00:00
..
Compiler	Merge pull request #58 from merk/index_transformer	2012-01-12 16:10:28 +00:00
Configuration.php	Made default manager configurable	2012-01-25 11:47:11 +00:00
FOQElasticaExtension.php	Merge branch '2.0'	2012-01-25 12:09:06 +00:00