Skip to content
Snippets Groups Projects
Commit 950d1ce9 authored by Laurent's avatar Laurent
Browse files

Merge branch 'master' into 'hotline-master'

# Conflicts:
#   library/ZendAfi/View/Helper/Accueil/Library.php
parents 2f947b3b 3f83365f
2 merge requests!2334Master,!2326Hotline master
Pipeline #2407 passed with stage
in 22 minutes and 29 seconds