IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
167ca1fbb5
DocSpace-buildtools/products
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.Calendar Merge branch 'develop' into feature/remove-unused-dep 2021-06-03 12:52:21 +03:00
ASC.CRM Merge branch 'develop' into feature/remove-unused-dep 2021-06-03 12:52:21 +03:00
ASC.Files Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/access-rights-admins 2021-06-09 00:23:12 +03:00
ASC.Mail Merge branch 'develop' into feature/remove-unused-dep 2021-06-03 12:52:21 +03:00
ASC.People Web: People: change trans on t 2021-06-08 16:09:51 +03:00
ASC.Projects Merge branch 'develop' into feature/remove-unused-dep 2021-06-03 12:52:21 +03:00