Alexey Safronov 0cd4cb49ed Merge branch 'feature/virtual-rooms-1.2' into feature/login-redesign ... # Conflicts: # packages/asc-web-components/modal-dialog/index.js # packages/asc-web-components/themes/dark.js # public/locales/de/Common.json # web/ASC.Web.Client/src/Shell.jsx # web/ASC.Web.Client/src/components/pages/Confirm/sub-components/createUser.js # web/ASC.Web.Login/src/Login.jsx		2022-03-16 11:03:07 +03:00
..
Controllers	Merge branch 'feature/virtual-rooms-1.2' into feature/login-redesign	2022-03-16 11:03:07 +03:00
Core	Settings: added update dns settings method	2022-02-17 15:55:42 +03:00
Models	Merge branch 'develop' into feature/virtual-rooms-1.2	2022-03-01 13:50:26 +03:00
Properties	refactoring launchSettings.json. added 'WSL 2 : Ubuntu 20.04' profile	2021-04-16 19:33:26 +03:00
appsettings.json	External config	2019-06-21 11:03:42 +03:00
ASC.Web.Api.csproj	cache: return support kafka. refactoring	2022-01-27 15:20:51 +03:00
ASC.Web.Api.sln	init commit	2019-05-15 17:56:09 +03:00
Program.cs	Merge branch 'develop' into feature/analizators	2022-01-31 14:35:16 +03:00
Startup.cs	cache: return support kafka. refactoring	2022-01-27 15:20:51 +03:00