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

Merge branch 'master2' into improvement/navigation-merged

# Conflicts:
#	_layouts/default.html
parents 52bcb26d 8bd2da55
No related branches found
No related tags found
No related merge requests found
Showing
with 173 additions and 67 deletions
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