AlexeySafronov 65378cc089 Merge branch 'develop' into feature/personal ... # Conflicts: # products/ASC.CRM/Client/public/index.html # products/ASC.Calendar/Client/public/index.html # products/ASC.Files/Client/public/index.html # products/ASC.Files/Client/src/HOCs/withFileActions.js # products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js # products/ASC.Files/Client/src/pages/Home/index.js # products/ASC.Mail/Client/public/index.html # products/ASC.People/Client/public/index.html # products/ASC.People/Client/src/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js # products/ASC.People/Client/src/pages/Profile/Section/Body/index.js # products/ASC.People/Client/src/pages/ProfileAction/Section/Body/updateUserForm.js # products/ASC.Projects/Client/public/index.html		2021-06-15 11:49:39 +03:00
..
ASC.Api.Core	Merge branch 'develop' into feature/two-factor-auth	2021-06-02 23:57:00 +03:00
ASC.Common	Tests moved to separate projects.	2021-06-01 12:21:51 +03:00
ASC.Core.Common	Merge branch 'develop' into feature/personal	2021-06-11 13:11:08 +03:00
ASC.Data.Encryption	Tests moved to separate projects.	2021-06-01 12:21:51 +03:00
ASC.Data.Reassigns	Tests moved to separate projects.	2021-06-01 12:21:51 +03:00
ASC.Data.Storage	Merge branch 'develop' into feature/remove-unused-dep	2021-06-03 12:52:21 +03:00
ASC.FederatedLogin	Tests moved to separate projects.	2021-06-01 12:21:51 +03:00
ASC.Feed	Scope: refactoring	2020-10-19 18:53:15 +03:00
ASC.IPSecurity	Tests moved to separate projects.	2021-06-01 12:21:51 +03:00
ASC.MessagingSystem	Tests moved to separate projects.	2021-06-01 12:21:51 +03:00
ASC.Notify.Textile	Tests moved to separate projects.	2021-06-01 12:21:51 +03:00
ASC.Resource.Manager	ResManager: additional feature	2021-06-03 12:48:25 +03:00
ASC.Socket.IO	SocketIO: yarn.lock	2021-04-06 20:36:41 +03:00
ASC.SsoAuth	SsoAuth: 2e37dcd0	2021-05-31 11:35:42 +03:00
ASC.Textile	refactoring launchSettings.json. added 'WSL 2 : Ubuntu 20.04' profile	2021-04-16 19:33:26 +03:00
ASC.Thumbnails	Thumb: security alert	2020-12-15 13:33:51 +03:00
ASC.UrlShortener
ASC.VoipService	Tests moved to separate projects.	2021-06-01 12:21:51 +03:00
services	UrlShortenerService: fix log	2021-06-11 11:44:10 +03:00
Tests	Web: Tests: Commented "Save empty 'EN' keys to not found files"	2021-06-11 18:18:38 +03:00