Skip to content
Extraits de code Groupes Projets
Valider 489da9fc rédigé par James Pic's avatar James Pic
Parcourir les fichiers

Merge pull request #55 from political-memory/url_conflicts

Fixed url conflicts
parents 83bfc3ef 1d2c09f8
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
......@@ -19,21 +19,21 @@ urlpatterns = [
views.RepresentativeDetail.as_view(),
),
url(
r'legislature/representative/$',
r'^legislature/representative/$',
views.RepresentativeList.as_view(),
),
url(
r'votes/dossier/$',
r'^votes/dossier/$',
views.DossierList.as_view(),
),
url(r'^admin/', include(admin.site.urls)),
url(r'legislature/', include('representatives.urls',
url(r'^legislature/', include('representatives.urls',
namespace='representatives')),
url(r'votes/', include('representatives_votes.urls',
url(r'^votes/', include('representatives_votes.urls',
namespace='representatives_votes')),
url(r'positions/', include('representatives_positions.urls',
url(r'^positions/', include('representatives_positions.urls',
namespace='representatives_positions')),
url(r'api/', include(api.router.urls)),
url(r'^api/', include(api.router.urls)),
url(r'^$', generic.TemplateView.as_view(template_name='home.html')),
]
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter