AlexeySafronov d00d16ee02 Merge branch 'master' into feature/files ... # Conflicts: # products/ASC.Files/Client/yarn.lock # products/ASC.People/Client/yarn.lock # web/ASC.Web.Client/src/components/pages/Wizard/index.js # web/ASC.Web.Client/yarn.lock # web/ASC.Web.Common/package.json # web/ASC.Web.Common/src/api/settings/index.js # web/ASC.Web.Common/src/pages/login/index.js # web/ASC.Web.Common/src/store/auth/reducer.js # web/ASC.Web.Common/src/utils/index.js # web/ASC.Web.Common/yarn.lock		2020-10-05 13:32:26 +03:00
..
ASC.Api.Core	Api: fix error response	2020-09-03 12:38:13 +03:00
ASC.Common	Settings: added password settings	2020-09-29 18:08:54 +03:00
ASC.Core.Common	Merge branch 'master' into feature/files	2020-10-05 13:32:26 +03:00
ASC.Data.Reassigns	scope: refactoring	2020-09-07 15:01:15 +03:00
ASC.Data.Storage	Merge branch 'master' into feature/release-11.0.0	2020-09-23 14:00:24 +03:00
ASC.FederatedLogin	Telegram: fix Kafka	2020-09-25 14:13:43 +03:00
ASC.Feed	fix	2020-08-27 17:01:37 +03:00
ASC.IPSecurity	private: firtst version	2020-08-12 12:58:08 +03:00
ASC.MessagingSystem	moved from release/11 4414f77b	2020-09-22 17:17:17 +03:00
ASC.Notify.Textile	Api: moved from release/11 4414f77b	2020-09-17 15:04:28 +03:00
ASC.Resource.Manager	moved from release/11 4414f77b	2020-09-22 17:17:17 +03:00
ASC.Socket.IO	socket.io: first version	2020-08-02 23:12:45 +03:00
ASC.Textile	fix	2020-08-27 17:01:37 +03:00
ASC.Thumbnails	Thumb: fix	2020-06-17 14:36:09 +03:00
ASC.UrlShortener	Added url shortener service	2020-03-05 14:45:34 +03:00
ASC.VoipService	fix	2020-08-27 17:01:37 +03:00
services	Merge branch 'master' into feature/files	2020-09-28 12:29:33 +03:00