Skip to content
This repository has been archived by the owner on Mar 13, 2024. It is now read-only.

Update NOTICE.txt #6250

Merged
merged 1 commit into from
Aug 25, 2020
Merged

Update NOTICE.txt #6250

merged 1 commit into from
Aug 25, 2020

Conversation

amyblais
Copy link
Member

@amyblais amyblais added 2: Dev Review Requires review by a core commiter CherryPick/Approved Meant for the quality or patch release tracked in the milestone labels Aug 24, 2020
@amyblais amyblais added this to the v5.27 milestone Aug 24, 2020
@grundleborg grundleborg added 4: Reviews Complete All reviewers have approved the pull request and removed 2: Dev Review Requires review by a core commiter labels Aug 25, 2020
@grundleborg grundleborg merged commit da8601a into mattermost:master Aug 25, 2020
@mattermod
Copy link
Contributor

@amyblais
Error trying doing the automated Cherry picking. Please do this manually

+++ Updating remotes...
Fetching upstream
Fetching origin
+++ Updating remotes done...
+++ Creating local branch automated-cherry-pick-of-mattermost-webapp-#6250-upstream-release-5.27-1598348114
Branch 'automated-cherry-pick-of-mattermost-webapp-#6250-upstream-release-5.27-1598348114' set up to track remote branch 'release-5.27' from 'upstream'.

+++ About to attempt cherry pick of PR #6250 with merge commit da8601a952c3f71bd01a7a947dee58a58ea92c73.


+++ Conflicts detected:

UU NOTICE.txt

+++ Aborting in-progress git cherry-pick.

+++ Returning you to the master branch and cleaning up.

grundleborg pushed a commit to grundleborg/mattermost-webapp that referenced this pull request Aug 25, 2020
@amyblais @grundleborg
Update NOTICE.txt (mattermost#6250)
7d1d4e9
@grundleborg
Copy link
Contributor

Manual cherry pick done.

@grundleborg grundleborg added CherryPick/Done Successfully cherry-picked to the quality or patch release tracked in the milestone and removed CherryPick/Approved Meant for the quality or patch release tracked in the milestone labels Aug 25, 2020
@amyblais amyblais added Changelog/Not Needed Does not require a changelog entry Docs/Not Needed Does not require documentation Changelog/Done Required changelog entry has been written and removed Changelog/Not Needed Does not require a changelog entry labels Aug 25, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@grundleborg grundleborg grundleborg approved these changes

Assignees
No one assigned
Labels
4: Reviews Complete All reviewers have approved the pull request Changelog/Done Required changelog entry has been written CherryPick/Done Successfully cherry-picked to the quality or patch release tracked in the milestone Docs/Not Needed Does not require documentation
Projects
None yet
Milestone
v5.27.0
Development

Successfully merging this pull request may close these issues.
3 participants
@amyblais @mattermod @grundleborg