Tim Nagel e78950ddb7 Merge branch 'master' into typed-config ... Conflicts: CHANGELOG-3.0.md Client.php DependencyInjection/Configuration.php DependencyInjection/FOSElasticaExtension.php DynamicIndex.php Resources/config/config.xml Resources/config/mongodb.xml Resources/config/orm.xml Tests/DependencyInjection/ConfigurationTest.php composer.json		2014-06-17 22:42:15 +10:00
..
config	Merge branch 'master' into typed-config	2014-06-17 22:42:15 +10:00
doc	Added documentation changes for indexable_callback	2014-06-17 10:07:10 +10:00
meta	Update LICENSE	2013-09-15 09:17:13 +02:00
public/images	add data collector for client class	2011-10-04 17:01:38 +02:00
views/Collector	added query string to collector and updated tests	2014-02-05 11:58:13 -06:00