Merge branch 'master' into export

This commit is contained in:
2016-04-15 23:21:34 +02:00
23 changed files with 1410 additions and 73 deletions

View File

@@ -44,9 +44,12 @@ class ChillActivityExtension extends Extension implements PrependExtensionInterf
{
$configuration = new Configuration();
$config = $this->processConfiguration($configuration, $configs);
$container->setParameter('chill_activity.form.time_duration', $config['form']['time_duration']);
$loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
$loader->load('services.yml');
$loader->load('services/repositories.yml');
}
public function prepend(ContainerBuilder $container)