Skip to content
Snippets Groups Projects
Commit aa54175e authored by Dominik Hebeler's avatar Dominik Hebeler
Browse files

Merge branch 'development' into '707-metager-spruche' 

# Conflicts:
#   app/Models/Quicktips/Quicktips.php
parents 8a1024ca 229ffe12
No related branches found
No related tags found
1 merge request!1365Resolve "Filter Options for MetaGer"
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 622 additions and 306 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