Commit 1c4e8c35 authored by Kiril Vorotyntsev's avatar Kiril Vorotyntsev
Browse files

Merge branch 'assemble' of gitlab.fi.muni.cz:xmartyn/pb175-project into assemble 

# Conflicts:
#	Messenger.Avalonia/ViewModels/Home/Navigation/GroupViewModel.cs
parents a4a8c636 71d851ec
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment