Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
thalia
concrexit
Commits
835dae7f
Commit
835dae7f
authored
Jan 25, 2017
by
Joost Rijneveld
Browse files
Merge branch 'fix/unique_namespaces' into 'master'
Fix uniqueness of url namespaces See merge request
!326
parents
2517eafc
aa849dfe
Changes
1
Hide whitespace changes
Inline
Side-by-side
website/thaliawebsite/urls.py
View file @
835dae7f
...
...
@@ -62,7 +62,7 @@ urlpatterns = [
url
(
r
'^nieuws/agenda/vcal\.php'
,
DeprecationFeed
()),
])),
url
(
r
'^newsletters/'
,
include
(
'newsletters.urls'
)),
url
(
r
'^nieuwsbrief/'
,
include
(
'newsletters.urls'
)
),
# for legacy reasons
url
(
r
'^nieuwsbrief/'
,
include
(
'newsletters.urls'
,
namespace
=
'newsletters-legacy'
),
),
# for legacy reasons
url
(
r
'^association$'
,
TemplateView
.
as_view
(
template_name
=
'singlepages/association.html'
),
name
=
'association'
),
url
(
r
'^'
,
include
([
# 'association' menu
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment