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

Merge branch 'development' into... 

Merge branch 'development' into '1115-create-and-link-to-information-page-about-the-used-search-engines'

# Conflicts:
#   resources/less/metager/pages/all.less
parents 1907a4bb 1e24e2ba
No related branches found
No related tags found
3 merge requests!1895Development,!1882Development,!1878Resolve "Create and link to information page about the used search engines"
Expand all Hide whitespace changes
Inline Side-by-side
resources/views/zitatsuche.blade.php
+ 1
− 1
View file @ 62a258cf
This diff is collapsed.
webpack.mix.js
+ 1
− 11
View file @ 62a258cf
This diff is collapsed.
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