Vladislav Makhov 1e483de4ba Merge branch 'develop' into feature/third-party-settings ... # Conflicts: # web/ASC.Web.Client/src/components/pages/Settings/locales/en/translation.json # web/ASC.Web.Client/src/components/pages/Settings/locales/ru/translation.json # web/ASC.Web.Client/src/components/pages/Settings/utils/settingsTree.js # web/ASC.Web.Client/src/store/settings/actions.js # web/ASC.Web.Client/src/store/settings/reducer.js # web/ASC.Web.Common/src/api/settings/index.js # web/ASC.Web.Components/src/components/icons/svg/index.js		2020-11-03 15:29:09 +03:00
..
ASC.Web.Api	Autofac: fix	2020-11-02 19:27:08 +03:00
ASC.Web.Client	Merge branch 'develop' into feature/third-party-settings	2020-11-03 15:29:09 +03:00
ASC.Web.Common	Merge branch 'develop' into feature/third-party-settings	2020-11-03 15:29:09 +03:00
ASC.Web.Components	Merge branch 'develop' into feature/third-party-settings	2020-11-03 15:29:09 +03:00
ASC.Web.Core	Autofac: fix	2020-11-02 19:27:08 +03:00
ASC.Web.Studio	Autofac: fix	2020-11-02 19:27:08 +03:00