Commit 8828d367 authored by Phil Höfer's avatar Phil Höfer
Browse files

Merge branch 'development' into '932-dark-stylesheet-alternative'

# Conflicts:
#   resources/less/metager/pages/resultpage/result-page.less
#   resources/less/metager/pages/resultpage/result.less
#   resources/less/metager/variables.less
#   webpack.mix.js
parents 1987d109 ed7b4825