Skip to content

Merge from 1.x #99

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

Merged
merged 10 commits into from
Jan 2, 2018
Merged

Merge from 1.x #99

merged 10 commits into from
Jan 2, 2018

Conversation

Jean85
Copy link
Contributor

@Jean85 Jean85 commented Dec 12, 2017

This PR realigns some utility files from the releases/1.x branch, to keep it up to date, and adds the release date for 2.0.

@Jean85 Jean85 added this to the Release 2.0 milestone Dec 12, 2017
@Jean85 Jean85 requested review from mitsuhiko and dcramer December 12, 2017 14:22
@@ -6,7 +6,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## [Unreleased]

## 2.0.0 - [Unreleased]
## 2.0.0 - 2017-12-12
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

assuming this is still correct?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

actually I think GH might be showing this diff funny (looking at the PR commit list vs whats in the 'compare' view)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(you may also want to double check the branch looks ok)

@Jean85 Jean85 merged commit 70789f4 into master Jan 2, 2018
@Jean85 Jean85 deleted the merge-from-1.x branch January 2, 2018 09:38
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