pavelbannov 0bbc383266 Merge branch 'master' into refactoring/di ... # Conflicts: # common/ASC.Api.Core/Auth/ConfirmAuthHandler.cs # common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs # web/ASC.Web.Api/Controllers/PortalController.cs # web/ASC.Web.Api/Controllers/SettingsController.cs # web/ASC.Web.Core/Notify/StudioNotifyService.cs		2019-10-30 11:45:55 +03:00
..
Client	web: People: Redesigned display of list of user groups. Added display of Title and actions on elements.	2019-10-29 13:29:44 +03:00
Server	Merge branch 'master' into refactoring/di	2019-10-30 11:45:55 +03:00