Skip to content
Commit c03a0a78 authored by Russell Keith-Magee's avatar Russell Keith-Magee
Browse files

[1.0.X] Updated svnmerge and svn:ignore properties for recent checkins 

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10673 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 0e5c80f8
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