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

..

app_template

Simplified default project template.

2013-02-04 13:21:36 +01:00

locale

Fixed #20582 -- Allowed default Form.label_suffix to be translated

2013-07-13 16:19:16 +02:00

project_template

Removed LocaleMiddleware from settings template.

2013-04-05 13:08:50 +02:00

urls

Advanced deprecation warnings for Django 1.7.

2013-06-29 18:49:37 +02:00

__init__.py

Removed some conditional code only needed under Python 2.6.

2013-07-01 12:02:17 +02:00

global_settings.py

Merge branch 'master' into schema-alteration

2013-07-22 19:04:25 +01:00