mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-23 21:59:11 +00:00
Code Issues 32 Releases Wiki Activity

Merge remote-tracking branch 'core/master' into schema-alteration

Browse Source 
Conflicts:
	django/core/management/commands/flush.py
	django/core/management/commands/syncdb.py
	django/db/models/loading.py
	docs/internals/deprecation.txt
	docs/ref/django-admin.txt
	docs/releases/1.7.txt
This commit is contained in:
Andrew Godwin
2013-08-09 14:17:30 +01:00
parent fddc5957c5 b575d690bb
commit de64c4d6e9
489 changed files with 3840 additions and 1593 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/multiple_database/tests.py
View File

@@ -1,4 +1,4 @@
from __future__ import absolute_import, unicode_literals
from __future__ import unicode_literals
import datetime
import pickle