2 Commits

Author	SHA1	Message	Date
Tim Graham	d73d0e071c	Fixed #22218 -- Deprecated django.conf.urls.patterns. ... Thanks Carl Meyer for the suggestion and Alex Gaynor and Carl for reviews.	2014-04-03 07:28:10 -04:00
Athena	5d568bcfa6	Fixed #7571 -- Fixed parameter matching in include()'d urlpattern ... Fixed URL resolving in the case where an outer regex includes an inner regex and both regexes use positional parameters instead of named groups, causing the outer regex's parameters to override the inner regex's. Modified the regex url resolver so that it will concatenates and then normalizes, instead of normalizing and then concatenating.	2014-03-05 00:35:03 +01:00