Merge branch '3.1' into 3.2

xabbuh · xabbuh · commit 58b95bddf603 · 2016-12-15T09:00:46.000+01:00
* 3.1:
  add missing code block directive
diff --git a/configuration/multiple_kernels.rst b/configuration/multiple_kernels.rst
@@ -108,6 +108,9 @@ they don't collide with the files from ``AppKernel``::
 In order for the autoloader to find your new ``ApiKernel``, make sure you add it
 to your ``composer.json`` autoload section:
 
+
+.. code-block:: json
+
     {
         "...": "..."
 

Original file line number	Diff line number	Diff line change
@@ -108,6 +108,9 @@ they don't collide with the files from ``AppKernel``::
`108`	`108`	In order for the autoloader to find your new ``ApiKernel``, make sure you add it
`109`	`109`	to your ``composer.json`` autoload section:
`110`	`110`
	`111`	`+`
	`112`	`+.. code-block:: json`
	`113`	`+`
`111`	`114`	`{`
`112`	`115`	`"...": "..."`
`113`	`116`