Skip to content

Reverted "Removed multi-table inheritance auto created PK from serialize". #4895

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 1 commit into from
Feb 11, 2017

Conversation

felixxm
Copy link
Contributor

@felixxm felixxm commented Feb 11, 2017

django/django@0595bca reverted django/django@74a575e, hence we can revert 1ecbeeb that fixed bugs caused by django/django@74a575e (see also #4852, #4574).

@carltongibson
Copy link
Collaborator

carltongibson commented Feb 11, 2017

@felixxm — Good work following that.

Q: "Do we need to do another quick release?" A: "No, it's OK. The extra condition is harmless" — it can wait until 1.11 drops or 3.6, whichever comes first, I suppose.

@carltongibson carltongibson added this to the 3.6.0 Release milestone Feb 11, 2017
@carltongibson carltongibson merged commit 20e3717 into encode:master Feb 11, 2017
@felixxm felixxm deleted the reverted-4852 branch February 13, 2017 12:27
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