Merge branch 'master' into 'dev'

# Conflicts:
#   docker-compose.yml

docker-compose.yml

@@ -4,7 +4,7 @@ services:
   web-app:
     restart: unless-stopped
     build: .
-    image: registry.forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client:dev
+    image: registry.forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client:${TAG}
     volumes:
       - ./dev.conf:/etc/nginx/conf.d/default.conf
     ports: