Skip to content
Snippets Groups Projects
Commit 0e937452 authored by esantangelo's avatar esantangelo
Browse files

Merge branch 'develop' into feature/upload-file 

# Conflicts:
#	Tsi1.Api/Tsi1.BusinessLayer/Services/TenantService.cs
parents b3af38d9 de014506
No related branches found
No related tags found
3 merge requests!20merge from develop,!16Feature/chat signalr,!15Feature/upload file
Hide whitespace changes
Inline Side-by-side
Showing
with 125 additions and 1 deletion
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