1
0
mirror of https://github.com/django/django.git synced 2024-12-27 03:25:58 +00:00
django/django/conf
Andrew Godwin 588b523233 Merge remote-tracking branch 'core/master' into schema-alteration
Conflicts:
	django/db/models/options.py
2013-08-09 14:37:37 +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 Deprecated django.utils.importlib 2013-07-29 17:10:22 +02:00
__init__.py Fixed test failures on Python 3 - refs #12288 2013-08-09 09:12:15 -04:00
global_settings.py Merge branch 'master' into schema-alteration 2013-07-22 19:04:25 +01:00