Merge branch 'deframa-diaspora' into 'master'

[diaspora](deframa) mise à jour

See merge request !462
2 jobs for master in 6 minutes and 46 seconds (queued for 4 seconds)
Status Name Job ID Coverage
  Test
passed pages #1277087

00:06:46

 
  Deploy
passed pages:deploy

00:00:02