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

fixed merge conflict

parents e4c3a544 97461f84
Branches
No related tags found
4 merge requests!1739Development,!1717Resolve "Major Startpage Redesign",!1681Draft: Resolve "Major Startpage Redesign",!1629WIP: Resolve "New Startpage Design"
Hide whitespace changes
Inline Side-by-side
Showing
with 67 additions and 14 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment