Commit Graph

3 Commits

Author SHA1 Message Date
Vladislav Makhov
ea7697d461 web: common: fix import 2021-03-01 12:30:21 +03:00
Artem Tarasov
69ed46e8ae Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
# Conflicts:
#	products/ASC.People/Client/src/components/Article/Body/index.js
#	web/ASC.Web.Login/src/Login.jsx
2021-02-25 15:27:36 +03:00
Artem Tarasov
fe7cb5364d Web: Common: chsnged component hierarchy 2021-02-25 11:04:22 +03:00