Skip to content

Cherry-pick placeholder versions into 13.1.x#22490

Merged
filipesilva merged 2 commits intoangular:13.1.xfrom
aspect-build:13.1.x
Jan 16, 2022
Merged

Cherry-pick placeholder versions into 13.1.x#22490
filipesilva merged 2 commits intoangular:13.1.xfrom
aspect-build:13.1.x

Conversation

@kormide
Copy link
Copy Markdown
Contributor

@kormide kormide commented Jan 12, 2022

@dgp1130

Cherry-picking these commits into 13.1.x since you mentioned there was a conflict. The conflict was just some package.json versions being changed next to my 0.0.0-PLACEHOLDER changes.

@dgp1130 dgp1130 added the target: patch This PR is targeted for the next patch release label Jan 12, 2022
@dgp1130 dgp1130 added the action: merge The PR is ready for merge by the caretaker label Jan 12, 2022
@dgp1130
Copy link
Copy Markdown
Collaborator

dgp1130 commented Jan 12, 2022

Thanks! I already started the release today, but I should be able to merge it in tomorrow morning.

@filipesilva filipesilva merged commit 8da55b2 into angular:13.1.x Jan 16, 2022
@angular-automatic-lock-bot
Copy link
Copy Markdown

This issue has been automatically locked due to inactivity.
Please file a new issue if you are encountering a similar or related problem.

Read more about our automatic conversation locking policy.

This action has been performed automatically by a bot.

@angular-automatic-lock-bot angular-automatic-lock-bot bot locked and limited conversation to collaborators Feb 16, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

action: merge The PR is ready for merge by the caretaker target: patch This PR is targeted for the next patch release

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants