Commit Graph

10 Commits

Author SHA1 Message Date
64782b49bf CoreCommon: Year field in TenantQuota is not used 2022-08-12 15:57:30 +03:00
9025541b0a CoreCommon: Year3 field in TenantQuota is not used 2022-08-12 15:57:30 +03:00
01783b3598 Core: Resources. 2022-05-12 15:44:31 +03:00
527a650601 WebStudio: resources 2021-05-27 21:30:15 +03:00
075798b90c moved from release/11 4414f77b 2020-09-22 17:17:17 +03:00
7f095f03d1 Merge branch 'master' into feature/Wizard
# Conflicts:
#	common/ASC.Resource.Manager/Startup.cs
#	config/kafka.json
#	web/ASC.Web.Core/PublicResources/UserControlsCommonResource.Designer.cs
#	web/ASC.Web.Core/PublicResources/UserControlsCommonResource.de.resx
#	web/ASC.Web.Core/PublicResources/UserControlsCommonResource.es.resx
#	web/ASC.Web.Core/PublicResources/UserControlsCommonResource.fr.resx
#	web/ASC.Web.Core/PublicResources/UserControlsCommonResource.it.resx
#	web/ASC.Web.Core/PublicResources/UserControlsCommonResource.resx
#	web/ASC.Web.Core/PublicResources/UserControlsCommonResource.ru.resx
#	web/ASC.Web.Core/TariffSettings.cs
2020-07-15 15:23:28 +03:00
533935906f Resource: fix 2020-07-15 12:55:31 +03:00
da9423bfdc Wizard: api 2020-07-02 17:11:59 +03:00
acebed2520 Resources: translations 2019-08-13 19:01:36 +03:00
a956764e9c Resources: translate 2019-08-13 18:49:59 +03:00