Tim Nagel 833feee207 Merge branch 'transport-option' of https://github.com/milan/FOSElasticaBundle into transport-option ... Conflicts: DependencyInjection/Configuration.php		2014-06-08 18:00:17 +10:00
..
Compiler	Fix definition decorators (closes #393)	2013-11-01 09:15:38 +11:00
Configuration.php	Merge branch 'transport-option' of https://github.com/milan/FOSElasticaBundle into transport-option	2014-06-08 18:00:17 +10:00
FOSElasticaExtension.php	Rename mappings to properties maintaining BC	2014-05-25 17:56:57 +10:00