1
0
mirror of https://github.com/django/django.git synced 2025-04-16 21:34:37 +00:00
Andrew Godwin 03ec3219a0 Merge branch 'master' into schema-alteration
Conflicts:
	django/db/backends/mysql/introspection.py
	django/db/backends/oracle/creation.py
	django/db/backends/postgresql_psycopg2/creation.py
	django/db/models/base.py
	django/db/models/loading.py
2013-07-22 19:04:25 +01:00
..
2013-05-21 10:42:15 +01:00
2013-06-29 11:58:36 +02:00
2013-02-26 10:00:14 +01:00