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.

Sign up for GitHub

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

Jump to bottom

Maintainers: merge up 2 -> master branches #107

Closed
robbieaverill opened this issue Nov 28, 2019 · 2 comments
Closed

Maintainers: merge up 2 -> master branches #107

robbieaverill opened this issue Nov 28, 2019 · 2 comments

Comments

@robbieaverill
Copy link
Contributor

@silverstripe/core-team

Some changes recently in the 2.x release line for PostgreSQLQuery are conflicting with the master branch, which has also been changed to use generators. I'm not familiar enough with the context to resolve these conflicts myself, so would be nice if someone wouldn't mind doing that!
@maxime-rainville
Copy link

Yeah, I was about to that. I'm just waiting for confirmation from @sminnee that silverstripe/silverstripe-framework#9098 doesn't require us to increment the required version of Framework.

@maxime-rainville
Copy link

Just confirmed that master is up to date with 2.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
3 participants
@maxime-rainville @robbieaverill @dnsl48