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
..
ASC.Calendar	Merge branch 'release/1.0.0' into bugfix/fixed-styles-selcted-row	2021-10-07 17:47:54 +03:00
ASC.CRM	Merge branch 'release/1.0.0' into bugfix/fixed-styles-selcted-row	2021-10-07 17:47:54 +03:00
ASC.Files	Merge branch 'develop' into feature/backup	2021-10-25 11:02:42 +03:00
ASC.Mail	Merge branch 'release/1.0.0' into bugfix/fixed-styles-selcted-row	2021-10-07 17:47:54 +03:00
ASC.People	Web: People: delete useless	2021-10-20 11:21:28 +03:00
ASC.Projects	Merge branch 'release/1.0.0' into bugfix/fixed-styles-selcted-row	2021-10-07 17:47:54 +03:00