Merge branch 'develop' into docs-tutorials-small-fixes

evildmp · web-flow · commit 441a730fda8d · 2018-06-05T17:04:00.000+01:00
diff --git a/docs/introduction/03-integrating_applications.rst b/docs/introduction/03-integrating_applications.rst
@@ -50,7 +50,7 @@ Add the ``poll`` URL configuration to ``urlpatterns`` in the project's ``urls.py
 
     urlpatterns += i18n_patterns(
         url(r'^admin/', include(admin.site.urls)),
-        url(r'^polls/', include('polls.urls', namespace='polls'))
+        url(r'^polls/', include('polls.urls', namespace='polls')),
         url(r'^', include('cms.urls')),
     )
 

Original file line number	Diff line number	Diff line change
@@ -50,7 +50,7 @@ Add the ``poll`` URL configuration to ``urlpatterns`` in the project's ``urls.py
`50`	`50`
`51`	`51`	`urlpatterns += i18n_patterns(`
`52`	`52`	`url(r'^admin/', include(admin.site.urls)),`
`53`		`- url(r'^polls/', include('polls.urls', namespace='polls'))`
	`53`	`+ url(r'^polls/', include('polls.urls', namespace='polls')),`
`54`	`54`	`url(r'^', include('cms.urls')),`
`55`	`55`	`)`
`56`	`56`