Skip to content
Snippets Groups Projects
Commit 626b18f3 authored by Ruben Bimberg's avatar Ruben Bimberg :computer:
Browse files

Merge branch 'staging' into... 

Merge branch 'staging' into 678-move-the-main-features-to-the-header-of-the-question-list-in-desktop-view

# Conflicts:
#	src/app/components/shared/header/header.component.html
parents dba4cbb6 4a5e5f64
Hide whitespace changes
Inline Side-by-side
Showing
with 14 additions and 13 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