Commit 98459d1a authored by Sean Madsen's avatar Sean Madsen

Merge branch 'master-webserver' into 'master'

Add symfony/web-server-bundle

See merge request documentation/docs-publisher!84
parents 642729ee 3a062bd2
/.idea/
/.web-server-pid
/app/config/parameters.yml
......
......@@ -24,6 +24,10 @@ class AppKernel extends Kernel {
$bundles[] = new Sensio\Bundle\GeneratorBundle\SensioGeneratorBundle();
}
if ('dev' === $this->getEnvironment()) {
$bundles[] = new Symfony\Bundle\WebServerBundle\WebServerBundle();
}
return $bundles;
}
......
......@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
"content-hash": "d208db26778343610edf4ee93218f418",
"content-hash": "bdcc8d941169838343327d298b7d3fdf",
"packages": [
{
"name": "composer/ca-bundle",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment