Skip to content
Snippets Groups Projects
Commit 010e7a91 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 69903262 8bc9937a
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 858 additions and 354 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment