Tatiana Lopaeva bec4f11dcd Merge branch 'develop' into feature/stripe ... # Conflicts: # common/ASC.Api.Core/Extensions/HostBuilderExtension.cs # common/services/ASC.Notify/Program.cs # common/services/ASC.Studio.Notify/Program.cs # common/services/ASC.Webhooks.Service/Program.cs # packages/common/components/Loaders/index.js # packages/common/store/AuthStore.js # packages/login/src/client/components/sub-components/recover-access-modal-dialog.tsx # packages/login/webpack.config.js # products/ASC.Files/Service/Program.cs # web/ASC.Web.Api/Program.cs		2022-09-15 17:16:04 +03:00
..
files	Merge branch 'develop' into feature/create-room	2022-08-29 17:15:20 +03:00
groups	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00
modules	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00
oforms	Web: Common: added oforms filter	2022-08-29 11:28:05 +03:00
people	Web: Fixed bugs.	2022-09-15 15:58:21 +03:00
plugins	Web:Common:Api: add 'request' func to plugins api	2022-08-24 19:53:33 +03:00
portal	Wed: Added new stores.	2022-09-14 09:55:22 +03:00
rooms	removed for-dev console.log	2022-08-25 18:16:03 +03:00
settings	Merge branch 'develop' into feature/stripe	2022-09-15 17:16:04 +03:00
user	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00
client.js	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00
index.js	Web: Common: added oforms filter	2022-08-29 11:28:05 +03:00