Tim Nagel
|
e78950ddb7
|
Merge branch 'master' into typed-config
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
|
2014-06-17 22:42:15 +10:00 |
|