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.

Sign up for GitHub

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

Jump to bottom

OSOE-751: Upgrade to Orchard Core 1.8 #106

Merged
merged 27 commits into from
Feb 21, 2024
Merged

OSOE-751: Upgrade to Orchard Core 1.8 #106

merged 27 commits into from
Feb 21, 2024

Conversation

Psichorex
Copy link
Contributor

@Psichorex Psichorex commented Jan 18, 2024 •
edited by jira bot
Loading

@Psichorex
Keeping T.
5a47e81
@Psichorex
Keeping T.
856c0fb
@Psichorex
Removing fields.
16918b8
@Psichorex
Keeping H.
1597f4c
@Psichorex
Adding comment.
8dea136
@Psichorex
Adding comment.
3e9780d
@Psichorex
Merge remote-tracking branch 'origin/dev' into issue/OSOE-751
f8f8e01
@Psichorex
Revert "Addressing warnings."
71ca884 
This reverts commit 5addb2e.

# Conflicts:
#	Lombiq.Hosting.Tenants.EmailQuotaManagement/Services/EmailQuotaSubjectService.cs
#	Lombiq.Hosting.Tenants.EmailQuotaManagement/Services/QuotaManagingSmtpServiceDecorator.cs
#	Lombiq.Hosting.Tenants.EnvironmentRobots/Filters/EnvironmentRobotsMetaTagFilter.cs
#	Lombiq.Hosting.Tenants.FeaturesGuard/Startup.cs
#	Lombiq.Hosting.Tenants.Management/Controllers/ShellSettingsEditorController.cs
@Psichorex
Fixes.
6253c59
@Psichorex
Fixes.
98f029c
@Psichorex
Removing workaround.
e4c85a7
@Psichorex Psichorex merged commit 3e640bc into dev Feb 21, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Piedone Piedone Piedone approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Psichorex @Piedone