TatianaLopaeva ae17671043 Merge branch 'develop' into feature/backup ... # Conflicts: # web/ASC.Web.Client/public/locales/en/Settings.json # web/ASC.Web.Client/public/locales/ru/Settings.json # web/ASC.Web.Client/src/store/SettingsSetupStore.js		2021-06-18 18:08:38 +03:00
..
ASC.Web.Api	WebApi: sendsms, setphone	2021-06-16 20:46:24 +03:00
ASC.Web.Client	Merge branch 'develop' into feature/backup	2021-06-18 18:08:38 +03:00
ASC.Web.Core	Merge pull request #245 from ONLYOFFICE/feature/crm-migrate	2021-06-16 17:02:46 +03:00
ASC.Web.Editor	Web: People: deleted fonts with ext .woff, added hash to font name	2021-06-08 15:26:56 +03:00
ASC.Web.Login	Merge branch 'develop' into bugfix/fixed-styles	2021-06-08 17:58:29 +03:00
ASC.Web.Studio	RazorCompileOnBuild:false<	2021-06-16 20:08:26 +03:00