Loading
Merge remote-tracking branch 'origin/2.0.x' into 2.x
* origin/2.0.x: Issue #3229888 by eelkeblok: Adjust optional administration view to new VBO schema
* origin/2.0.x: Issue #3229888 by eelkeblok: Adjust optional administration view to new VBO schema