DocSpace-client/products
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.Calendar RazorCompileOnBuild:false< 2021-06-16 20:08:26 +03:00
ASC.CRM RazorCompileOnBuild:false< 2021-06-16 20:08:26 +03:00
ASC.Files Merge branch 'develop' into feature/backup 2021-06-18 18:08:38 +03:00
ASC.Mail RazorCompileOnBuild:false< 2021-06-16 20:08:26 +03:00
ASC.People RazorCompileOnBuild:false< 2021-06-16 20:08:26 +03:00
ASC.Projects RazorCompileOnBuild:false< 2021-06-16 20:08:26 +03:00