Branch: refs/heads/stable/1.6.x
  Home:   https://github.com/django/django
  Commit: 0f272629ca18e440aef67b4a3fd9377a57fb25a8
      
https://github.com/django/django/commit/0f272629ca18e440aef67b4a3fd9377a57fb25a8
  Author: Anssi Kääriäinen <akaar...@gmail.com>
  Date:   2014-02-04 (Tue, 04 Feb 2014)

  Changed paths:
    M django/contrib/gis/db/models/sql/compiler.py
    M django/db/models/sql/compiler.py
    M tests/model_inheritance_regress/tests.py

  Log Message:
  -----------
  [1.6.x] Fixed #21413 -- resolve_columns fields misalignment

Backpatch of 9918c11114ac3ec9622631558ef26ebf3919cb69 from master.

Conflicts:

        django/db/models/sql/compiler.py
        tests/model_inheritance_regress/tests.py


-- 
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to django-updates+unsubscr...@googlegroups.com.
To post to this group, send email to django-updates@googlegroups.com.
To view this discussion on the web visit 
https://groups.google.com/d/msgid/django-updates/52f10a215a497_777112d5d3878642%40hookshot-fe7-pe1-prd.aws.github.net.mail.
For more options, visit https://groups.google.com/groups/opt_out.

Reply via email to