Commit fe85633c authored by Louis Chemineau's avatar Louis Chemineau
Browse files

Merge branch 'master' into 'master'

# Conflicts:
#   lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/PortalConstants.pm
parents 7d503fd0 93cb619c
Pipeline #10003 failed with stages
in 21 minutes and 16 seconds