Jeremy Mikola
|
440c36f537
|
Merge remote-tracking branch 'cevou/master' into pr/245
Conflicts:
Command/PopulateCommand.php
Command/SearchCommand.php
DependencyInjection/Configuration.php
Doctrine/AbstractElasticaToModelTransformer.php
Doctrine/AbstractListener.php
Doctrine/MongoDB/ElasticaToModelTransformer.php
Doctrine/ORM/ElasticaToModelTransformer.php
Doctrine/RepositoryManager.php
Finder/TransformedFinder.php
Paginator/PaginatorAdapterInterface.php
Paginator/RawPaginatorAdapter.php
Persister/ObjectPersister.php
Propel/ElasticaToModelTransformer.php
Subscriber/PaginateElasticaQuerySubscriber.php
Tests/DataCollector/ElasticaDataCollectorTest.php
Tests/Doctrine/AbstractProviderTest.php
Tests/Doctrine/RepositoryManagerTest.php
Tests/Manager/RepositoryManagerTest.php
Tests/RepositoryTest.php
Transformer/ElasticaToModelTransformerCollection.php
composer.json
|
2013-03-27 14:58:34 -04:00 |
|