Skip to content

Prepare 6.11-alpha#10919

Merged
mansona merged 26 commits intomasterfrom
merge-beta
Jan 8, 2026
Merged

Prepare 6.11-alpha#10919
mansona merged 26 commits intomasterfrom
merge-beta

Conversation

@mansona
Copy link
Member

@mansona mansona commented Jan 7, 2026

No description provided.

NullVoxPopuli and others added 25 commits October 30, 2025 13:42
# Conflicts:
#	.release-plan.json
#	CHANGELOG.md
#	package.json
#	packages/app-blueprint/files/package.json
Promote Beta and update all dependencies for 6.9 release
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
# Conflicts:
#	CHANGELOG.md
#	package.json
#	packages/app-blueprint/files/package.json
#	pnpm-lock.yaml
#	tests/fixtures/addon/defaults/package.json
#	tests/fixtures/addon/pnpm/package.json
#	tests/fixtures/addon/typescript/package.json
#	tests/fixtures/addon/yarn/package.json
#	tests/fixtures/app/defaults/package.json
#	tests/fixtures/app/embroider-no-ember-data/package.json
#	tests/fixtures/app/embroider-no-welcome/package.json
#	tests/fixtures/app/embroider-pnpm/package.json
#	tests/fixtures/app/embroider-yarn/package.json
#	tests/fixtures/app/embroider/package.json
#	tests/fixtures/app/no-ember-data/package.json
#	tests/fixtures/app/npm/package.json
#	tests/fixtures/app/pnpm/package.json
#	tests/fixtures/app/typescript-embroider-no-ember-data/package.json
#	tests/fixtures/app/typescript-embroider/package.json
#	tests/fixtures/app/typescript-no-ember-data/package.json
#	tests/fixtures/app/typescript/package.json
#	tests/fixtures/app/yarn/package.json
@mansona mansona force-pushed the merge-beta branch 2 times, most recently from 616af73 to cc1b97f Compare January 7, 2026 14:53
@mansona mansona requested a review from a team January 7, 2026 15:15
@mansona mansona merged commit 469cd50 into master Jan 8, 2026
70 checks passed
@mansona mansona deleted the merge-beta branch January 8, 2026 09:34
@mansona mansona mentioned this pull request Jan 8, 2026
@mansona mansona mentioned this pull request Jan 25, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants