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-548: Upgrade to Orchard Core 1.6 in Orchard-Base-Theme #63

Merged
merged 30 commits into from
Jun 18, 2023
Merged

OSOE-548: Upgrade to Orchard Core 1.6 in Orchard-Base-Theme #63

merged 30 commits into from
Jun 18, 2023

Conversation

Psichorex
Copy link
Contributor

@Psichorex Psichorex commented Apr 25, 2023 •
edited by jira bot
Loading

Piedone
Piedone requested changes Apr 28, 2023
View reviewed changes
Lombiq.BaseTheme/pnpm-lock.yaml Outdated Show resolved Hide resolved
@Psichorex
Reverting pnpm lock.
855956a
@Psichorex
Merge remote-tracking branch 'origin/dev' into issue/OSOE-548
66c042a 
# Conflicts:
#	Lombiq.BaseTheme.Samples/Lombiq.BaseTheme.Samples.csproj
#	Lombiq.BaseTheme/Lombiq.BaseTheme.csproj
@Piedone
Merge pull request #69 from Lombiq/issue/OSOE-641
18ed2f8 
OSOE-641: Fix remaining issues for the Orchard Core 1.6 upgrade in Orchard-Base-Theme
Piedone
Piedone reviewed Jun 10, 2023
View reviewed changes
Copy link
Member

@Piedone Piedone left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just marking the merge from issue/OSOE-641.

@Piedone Piedone merged commit d175b27 into dev Jun 18, 2023
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.
4 participants
@Psichorex @Piedone @dministro @sarahelsaig