Commit b1c69fd1 authored by Dominik Hebeler's avatar Dominik Hebeler
Browse files

Merge branch 'patch-4' into 'development'

Update settings.php

See merge request !826
parents aa0dc63d 26c30d81