Viktor Fomin 0128b01518 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth ... # Conflicts: # products/ASC.People/Client/public/locales/en/Profile.json # products/ASC.People/Client/public/locales/ru/Profile.json # products/ASC.People/Client/src/pages/Profile/Section/Body/index.js # web/ASC.Web.Client/public/locales/en/Confirm.json # web/ASC.Web.Client/public/locales/en/Settings.json # web/ASC.Web.Client/public/locales/ru/Confirm.json # web/ASC.Web.Client/public/locales/ru/Settings.json		2021-04-26 15:57:19 +03:00
..
Controllers	Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth	2021-04-26 15:57:19 +03:00
Core	Auth by thirdparty	2021-02-19 19:16:08 +03:00
Models	Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth	2021-04-26 15:57:19 +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	Merge branch 'develop' into feature/dotnet5	2021-03-25 21:50:09 +03:00
ASC.Web.Api.sln	init commit	2019-05-15 17:56:09 +03:00
Program.cs	replace Path.Combine to CrossPlatform.PathCombine	2021-04-16 16:26:26 +03:00
Startup.cs	Fixed loading products, lazy loading webitemmanager	2021-01-26 12:29:50 +03:00