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
..
public	Merge branch 'develop' into feature/stripe	2022-09-15 17:16:04 +03:00
src	Merge branch 'develop' into feature/stripe	2022-09-15 17:16:04 +03:00
tests	Web: Merged 'Files' module with 'Client' and fixed paths	2022-07-24 19:57:03 +03:00
.babelrc	Web: Editor/Client: added ts support	2022-08-17 10:21:43 +03:00
.env	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00
.gitattributes	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00
.gitignore	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00
analyse.js	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00
codecept.conf.js	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00
Dockerfile	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00
jsconfig.json	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00
package.json	Merge branch 'develop' into feature/login-ssr	2022-08-30 18:38:12 +03:00
steps_file.js	Web: Client: Added missing code	2022-07-24 20:03:48 +03:00
steps.d.ts	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00
webpack.config.js	Web: Made toastr work from single function (duplicate issue)	2022-09-08 14:29:59 +03:00