Richard Miller 123da22ebd Merge remote-tracking branch 'Fran6co/imp-lat_lon' ... Conflicts: DependencyInjection/Configuration.php		2012-08-02 14:54:49 +01:00
..
Compiler	[Provider] Create ProviderRegistry service (BC break)	2012-03-12 12:07:51 -04:00
Configuration.php	Merge remote-tracking branch 'Fran6co/imp-lat_lon'	2012-08-02 14:54:49 +01:00
FOQElasticaExtension.php	Merge remote-tracking branch 'origin/attachment_type_transformation'	2012-07-08 15:38:09 +01:00