Conflicts: CHANGELOG-3.0.md Client.php DependencyInjection/Configuration.php DependencyInjection/FOSElasticaExtension.php DynamicIndex.php Resources/config/config.xml Resources/config/mongodb.xml Resources/config/orm.xml Tests/DependencyInjection/ConfigurationTest.php composer.json |
||
---|---|---|
.. | ||
app | ||
ConfigurationManagerTest.php | ||
IndexableCallbackTest.php | ||
MappingToElasticaTest.php | ||
TypeObj.php | ||
WebTestCase.php |