IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
69ed46e8ae
DocSpace-client/web
History
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
..
ASC.Web.Api Merge branch 'develop' into feature/not-implemented-page 2021-02-20 11:35:52 +03:00
ASC.Web.Client Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-02-25 15:27:36 +03:00
ASC.Web.Core Merge branch 'develop' into feature/not-implemented-page 2021-02-20 11:35:52 +03:00
ASC.Web.Login Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-02-25 15:27:36 +03:00
ASC.Web.Studio Merge branch 'develop' into feature/not-implemented-page 2021-02-15 10:58:34 +03:00