Skip to content
Snippets Groups Projects
Commit 0edc05e3 authored by Phil Höfer's avatar Phil Höfer
Browse files

Merge branch 'development' into '776-falsche-schriftbasis' 

# Conflicts:
#   resources/assets/less/metager/result.less
parents d8be0598 2a4b3f04
No related branches found
No related tags found
1 merge request!1286Resolve "Falsche Schriftbasis"
Hide whitespace changes
Inline Side-by-side
Showing
with 38 additions and 53 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