Merge branch 'master' into dev

This commit is contained in:
Jonas Winkler 2018-07-15 13:41:43 +02:00
commit 04384c7037

View File

@ -34,8 +34,8 @@ urlpatterns = [
r"^api/auth/",
include('rest_framework.urls', namespace="rest_framework")
),
# TODO: this does not work in django 2.0!
# url(r"^api/", include(router.urls, namespace="drf")),
url(r"^api/", include((router.urls, 'drf'))),
# File downloads
url(