Tim Nagel aa9d74a8a0 Merge remote-tracking branch 'PeerJ/AddServerTimeout' ... Conflicts: DependencyInjection/Configuration.php		2014-02-19 13:39:03 +11:00
..
Compiler	Fix definition decorators (closes #393)	2013-11-01 09:15:38 +11:00
Configuration.php	Merge remote-tracking branch 'PeerJ/AddServerTimeout'	2014-02-19 13:39:03 +11:00
FOSElasticaExtension.php	adding ttl for documents	2014-01-30 12:39:48 +01:00