Damien Alexandre d546b4d3f3 Merge remote-tracking branch 'origin/serializer-transformer' into serializer-integration ... Conflicts: DependencyInjection/FOSElasticaExtension.php Resources/config/config.xml		2013-11-29 10:07:13 +01:00
..
Compiler	Fix definition decorators (closes #393)	2013-11-01 09:15:38 +11:00
Configuration.php	Merge branch '2.1.x'	2013-11-11 13:30:29 +11:00
FOSElasticaExtension.php	Merge remote-tracking branch 'origin/serializer-transformer' into serializer-integration	2013-11-29 10:07:13 +01:00