Merge branch 'master' into '57-masquage-projets-portefeuilles-dans-le-dashboard'

# Conflicts:
#   shared/factories/university.factory.js
1 job for 57-masquage-projets-portefeuilles-dans-le-dashboard in 51 seconds (queued for 1 second)
Status Job ID Name Coverage
  Test
passed #128481
sonar-analysis

00:00:51