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 master into features #5868

Merged
merged 8 commits into from
Sep 21, 2019
Merged

Merge master into features #5868

merged 8 commits into from
Sep 21, 2019

Conversation

blueyed
Copy link
Contributor

@blueyed blueyed commented Sep 21, 2019

No description provided.

nicoddemus and others added 8 commits September 18, 2019 10:10
As discussed in the mailing list, pytest will join the
digital strike for the climate on Sep 20th. This will show
a closable banner on the docs until the date, and when the date
comes the banner will become a (closable) full page.

I will also pin an issue saying that the developers won't be
available on Sep 20th.
Show banner/full page for the Digital Climate Strike
@nicoddemus
Copy link
Member

Beat me to it 😁

@blueyed
Copy link
Contributor Author

blueyed commented Sep 21, 2019

Oh, would have waited then.. merely thought it would be useful for the version number (but not sure if that works / makes a difference after all?!)

@blueyed blueyed merged commit c1361b4 into pytest-dev:features Sep 21, 2019
@blueyed blueyed deleted the mm branch September 21, 2019 14:29
@nicoddemus
Copy link
Member

Oh not at all... thanks for doing it. I merely thought "hmm should merge master into features" and saw your PR. 😁

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants