Skip to content
Snippets Groups Projects
Commit 51f15965 authored by Silvio Giebl's avatar Silvio Giebl
Browse files

Merge branch 'feature/search-sections' into improvement/navigation-new

# Conflicts:
#	_includes/nav.html
#	_layouts/default.html
#	assets/js/search-data.json
#	docs/configuration.md
#	lib/tasks/search.rake
parents 18f3a416 16628f2b
No related branches found
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment