Commit 5a3c3d82 authored by Matthias Clasen's avatar Matthias Clasen

Merge branch 'inspector-controllers' into 'master'

Inspector controllers

See merge request !3101
parents 40446201 ccd9827b
Pipeline #249111 failed with stages
in 26 minutes and 41 seconds