809 bug: change logout button at timeout
809 bug: change logout button at timeout
Merge branch 'feature/618-session-timeout' into develop
resolve merge conflict
tagging version 7.x-0.19+dbc.9
Merge branch 'release/7.x-0.19+dbc.9' into develop