Merge remote-tracking branch 'origin/master' into testing

docs/source/installation/index.rst

@@ -144,7 +144,7 @@ Add a Gitlab token to ensure that you get always the source code:
 
 The auth token should appears now in the directory :code:`.composer`:
 
-... code-block: bash
+.. code-block: bash
 
    $ cat .composer/auth.json
    {
@@ -275,11 +275,11 @@ In order to do that without pain, use those steps:
 1. at the app's root, update the `composer.json` to your current branch:
 
 .. code-block:: json
+
    {
       "require": {
           "chill-bundles": "dev-<my-branch>@dev"
    }
-```
 
 2. mount into the php container, and run `composer update`