Skip to content
Snippets Groups Projects
Commit 89c94485 authored by Shpuld Shpludson's avatar Shpuld Shpludson
Browse files

fix conflict

parents 46de457f ae3b92ce
No related branches found
No related tags found
2 merge requests!1028`master` refresh with `develop`,!703Mobile notifications in nav bar, separate mobile navbar to its own component
Pipeline #9818 passed
Stage: lint
Stage: build
Stage: test
Hide whitespace changes
Inline Side-by-side
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