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

Merge branch 'MetaGer-Redesign' into 'development'

# Conflicts:
#   resources/assets/less/metager/result-page.less
parents e63a7f42 c0e37f35