Skip to content
Commit b6a957f0 authored by Andrew Godwin's avatar Andrew Godwin
Browse files

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

Conflicts:
	docs/ref/django-admin.txt
parents 52edc160 3c030040
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment