pavelbannov f00a964c32 Merge branch 'master' into feature/private ... # Conflicts: # common/ASC.Api.Core/Auth/ConfirmAuthHandler.cs # web/ASC.Web.Api/Controllers/SettingsController.cs		2020-08-14 17:19:36 +03:00
..
ConfirmAuthHandler.cs	Merge branch 'master' into feature/private	2020-08-14 17:19:36 +03:00
CookieAuthHandler.cs	private: firtst version	2020-08-12 12:58:08 +03:00