Jeremy Mikola 4a889406e9 Merge branch '2.0.x' into 2.1.x ... Conflicts: Tests/Transformer/ModelToElasticaAutoTransformerTest.php		2013-07-17 15:55:55 -04:00
..
ElasticaToModelTransformerCollectionTest.php	Rename FOQ namespaces and services to FOS	2013-03-27 13:44:06 -04:00
ModelToElasticaAutoTransformerTest.php	Merge branch '2.0.x' into 2.1.x	2013-07-17 15:55:55 -04:00