Tim Nagel 85c4dc92f9 Merge tag 'v2.1.3' ... Conflicts: DependencyInjection/Configuration.php README.md		2013-10-30 09:06:48 +11:00
..
Compiler	Merge remote-tracking branch 'cevou/master' into pr/245	2013-03-27 14:58:34 -04:00
Configuration.php	Merge tag 'v2.1.3'	2013-10-30 09:06:48 +11:00
FOSElasticaExtension.php	Fix parent mapping	2013-06-17 21:19:11 +02:00