AlexeySafronov 72527ccded Merge branch 'master' into develop ... # Conflicts: # lerna.json # package.json # packages/asc-web-common/package.json # packages/asc-web-components/package.json # products/ASC.CRM/Client/package.json # products/ASC.Calendar/Client/package.json # products/ASC.Files/Client/package.json # products/ASC.Mail/Client/package.json # products/ASC.People/Client/package.json # products/ASC.Projects/Client/package.json # web/ASC.Web.Client/package.json # web/ASC.Web.Editor/package.json # web/ASC.Web.Login/package.json		2021-05-29 21:57:42 +03:00
..
api	Web: Common: Api: Added removeShareFiles api method	2021-05-19 16:51:43 +03:00
components	Merge branch 'develop' into bugfix/context-actions	2021-05-20 13:24:18 +03:00
constants	Web: Files: removed file format for unselected items	2021-05-04 17:42:06 +03:00
desktop	Web: Move toastr function to Web Client (mf: "studio/toastr")	2021-03-03 16:46:04 +03:00
history	Web: Common: chsnged component hierarchy	2021-02-25 11:04:22 +03:00
store	Web: Fix setModuleInfo usage	2021-05-20 11:27:50 +03:00
utils	Merge branch 'hotfix/v0.1.9' of https://github.com/ONLYOFFICE/AppServer into hotfix/v0.1.9	2021-04-30 17:25:32 +03:00
custom.scss	Web: Moved custom.scss to @appserver/common	2021-05-19 11:14:44 +03:00
index.js	Web: Deleted useless exports.	2021-03-17 16:45:36 +03:00
package.json	Merge branch 'master' into develop	2021-05-29 21:57:42 +03:00