Merge branch 'master' into 'Javascript-continious-upload-translate'

# Conflicts:
#   photo21/settings.py

photo21/urls.py

@@ -14,6 +14,9 @@ from django.contrib import admin
 from django.urls import include, path, re_path
 from django.views.i18n import JavaScriptCatalog
 
+if settings.DEBUG : 
+    from debug_toolbar.toolbar import debug_toolbar_urls
+
 from .views import IndexView, MediaAccess
 
 urlpatterns = [
@@ -29,6 +32,7 @@ urlpatterns = [
 # In production media are served through NGINX with X-Accel-Redirect
 if settings.DEBUG:
     urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
+    urlpatterns += debug_toolbar_urls()
 else:
     urlpatterns.append(
         re_path("^media/(?P<path>.*)", MediaAccess.as_view(), name="media")