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

Merge branch '1012-major-startpage-redesign' into 'development' 

# Conflicts:
#   .gitignore
#   resources/lang/es/index.php
#   resources/lang/es/sidebar.php
#   resources/views/index.blade.php
#   resources/views/layouts/staticPages.blade.php
parents 3f2dd7e1 01e5e803
No related branches found
No related tags found
4 merge requests!1739Development,!1717Resolve "Major Startpage Redesign",!1712Development,!1681Draft: Resolve "Major Startpage Redesign"
Hide whitespace changes
Inline Side-by-side
Showing
with 1035 additions and 2 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