Tatiana Lopaeva 8ba2f0c694 Merge branch 'develop' into feature/backup ... # Conflicts: # packages/asc-web-common/api/settings/index.js # web/ASC.Web.Api/Models/SettingsWrapper.cs		2021-10-25 11:02:42 +03:00
..
Client	Merge branch 'develop' into feature/backup	2021-10-25 11:02:42 +03:00
Core	Merge pull request #403 from ONLYOFFICE/bugfix/get-fileops	2021-10-20 11:24:02 +03:00
Server	Merge branch 'develop' into bugfix/version-history-list	2021-10-21 12:02:57 +03:00
Service	Added notify	2021-09-03 18:04:06 +03:00
Tests	fix test	2021-10-19 20:29:45 +03:00