Merge branch '1.0.x'

Browse source

Conflicts:
	Command/PopulateCommand.php
	Command/SearchCommand.php
	DependencyInjection/Compiler/AddProviderPass.php
	DependencyInjection/FOQElasticaExtension.php
	Doctrine/AbstractListener.php
	Doctrine/AbstractProvider.php
	Doctrine/MongoDB/Listener.php
	Doctrine/MongoDB/Provider.php
	Doctrine/ORM/Listener.php
	Doctrine/ORM/Provider.php
	FOQElasticaBundle.php
	Finder/TransformedFinder.php
	IndexManager.php
	MappingRegistry.php
	Paginator/AbstractPaginatorAdapter.php
	Paginator/RawPaginatorAdapter.php
	Paginator/TransformedPaginatorAdapter.php
	Populator.php
	Propel/Provider.php
	Provider/ProviderInterface.php
	README.md
	Repository.php
	Reseter.php
	Resources/config/config.xml
	Resources/config/mongodb.xml
	Resources/config/orm.xml
	Resources/config/propel.xml
	Tests/Doctrine/MongoDB/ListenerTest.php
	Tests/Doctrine/ORM/ListenerTest.php
	Tests/IndexManagerTest.php
	Tests/MappingRegistryTest.php
	Tests/PopulatorTest.php
	Tests/ReseterTest.php
	Transformer/ElasticaToModelTransformerCollection.php

...

This commit is contained in:

Jeremy Mikola 2013-03-27 13:57:39 -04:00

parent 3fb9aaa56a 49de4d361d

commit a7b37f3c41

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available