Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/commits from develop #231

Merged
merged 10 commits into from
Feb 16, 2024
Merged

Conversation

andreysavihin
Copy link
Member

SuhorukovAnton and others added 10 commits February 16, 2024 16:10
…heck tenant name

# Conflicts:
#	web/ASC.Web.Api/Api/Settings/GreetingSettingsController.cs
…ting IP (Error while parse Http Request for FileConverted type of event)
…me.MaxValue.ToString throw exception in ar-SA Culture)
…atedRevisionComment audit event is written to the database without room information)
# Conflicts:
#	products/ASC.Files/Core/Configuration/ProductEntryPoint.cs
#	products/ASC.Files/Server/ProductEntryPoint.cs
#	web/ASC.Web.Core/IProduct.cs
#	web/ASC.Web.Core/Notify/StudioWhatsNewNotify.cs
#	web/ASC.Web.Core/Product.cs
@pavelbannov pavelbannov merged commit 8887835 into hotfix/v2.0.4 Feb 16, 2024
3 checks passed
@pavelbannov pavelbannov deleted the feature/commits-from-develop branch February 16, 2024 14:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants