IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9019b36951
DocSpace-client/packages
History
Viktor Fomin b7ce4a35e7 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/access-rights-admins 
# Conflicts:
#	products/ASC.Files/Server/DocStore
#	web/ASC.Web.Client/public/locales/en/Settings.json
#	web/ASC.Web.Client/public/locales/ru/Settings.json
#	web/ASC.Web.Client/src/components/pages/Settings/categories/security/sub-components/admins.js
#	web/ASC.Web.Client/src/components/pages/Settings/index.js
2021-06-09 00:23:12 +03:00
..
asc-web-common Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/access-rights-admins 2021-06-09 00:23:12 +03:00
asc-web-components Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/access-rights-admins 2021-06-09 00:23:12 +03:00