Merge branch 'master' into 'master'
# Conflicts: # lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/PortalConstants.pm
Too many changes to show.
To preserve performance only 20 of 1000+ files are displayed.
# Conflicts: # lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/PortalConstants.pm