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.

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

Merge develop into master #211

Merged
merged 4 commits into from
Jun 4, 2021

Conversation

matsduf
Copy link
Contributor

@matsduf matsduf commented Jun 3, 2021

Purpose

Merge develop into master. This is not formally part of v2021.1.1. This will only correct the instructions on Github.

Context

Created following instructions in https://github.com/zonemaster/zonemaster/blob/develop/docs/internal-documentation/maintenance/ReleaseProcess-release.md#12-merge-develop-branch-into-master

Changes

How to test this PR

@matsduf matsduf added the P-High Priority: Issue to be solved before other label Jun 3, 2021
@matsduf matsduf added this to the v2021.1.1 milestone Jun 3, 2021
@matsduf matsduf requested review from mattias-p and a user June 3, 2021 15:06
@matsduf
Copy link
Contributor Author

matsduf commented Jun 4, 2021

We ignore the Travis warnings for this PR. See issue #210

@matsduf matsduf merged commit 8062b2f into zonemaster:master Jun 4, 2021
@matsduf matsduf deleted the merge-develop-into-master branch June 4, 2021 10:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
P-High Priority: Issue to be solved before other
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants